projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: cb175f2)
Merge branch 'develop' into cancel_transfer_for_deleted_users
authormasensio <masensio@solidgear.es>
Thu, 19 Feb 2015 11:54:59 +0000 (12:54 +0100)
committermasensio <masensio@solidgear.es>
Thu, 19 Feb 2015 11:54:59 +0000 (12:54 +0100)
Conflicts:
AndroidManifest.xml


No differences found
ownCloud Android App