projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: efb3989)
Merge branch 'develop' into uploadWhenCharging
authormasensio <masensio@solidgear.es>
Tue, 1 Sep 2015 14:51:40 +0000 (16:51 +0200)
committermasensio <masensio@solidgear.es>
Tue, 1 Sep 2015 14:51:40 +0000 (16:51 +0200)
Conflicts:
res/values-fr/strings.xml
res/xml/preferences.xml


No differences found
ownCloud Android App