projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: b9ef747)
Merge branch 'master' into sync_full_folder
authormasensio <masensio@solidgear.es>
Tue, 27 Oct 2015 07:52:17 +0000 (08:52 +0100)
committermasensio <masensio@solidgear.es>
Tue, 27 Oct 2015 07:52:17 +0000 (08:52 +0100)
Conflicts:
owncloud-android-library
src/com/owncloud/android/files/services/FileUploader.java


No differences found
ownCloud Android App