projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 9494620)
Merge branch 'master' into sync_full_folder
authormasensio <masensio@solidgear.es>
Wed, 30 Sep 2015 10:24:01 +0000 (12:24 +0200)
committermasensio <masensio@solidgear.es>
Wed, 30 Sep 2015 10:24:01 +0000 (12:24 +0200)
Conflicts:
src/com/owncloud/android/providers/FileContentProvider.java


No differences found
ownCloud Android App