projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7eea2ea 8882fb2)
Merge branch 'develop' into thumbnailOOM
authormasensio <masensio@solidgear.es>
Tue, 5 May 2015 11:53:56 +0000 (13:53 +0200)
committermasensio <masensio@solidgear.es>
Tue, 5 May 2015 11:53:56 +0000 (13:53 +0200)

Trivial merge
ownCloud Android App