projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5a8f605 6a9f1ad)
Merge branch 'master' of github.com:owncloud/android
authormasensio <masensio@solidgear.es>
Wed, 30 Sep 2015 08:49:47 +0000 (10:49 +0200)
committermasensio <masensio@solidgear.es>
Wed, 30 Sep 2015 08:49:47 +0000 (10:49 +0200)
Conflicts:
CHANGELOG.md


Trivial merge
ownCloud Android App