projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9ef747 3444d61)
Merge pull request #1219 from owncloud/sync_full_folder__fix_conflict_save_local_version
authorDavid A. Velasco <dvelasco@owncloud.com>
Fri, 30 Oct 2015 12:59:02 +0000 (13:59 +0100)
committerDavid A. Velasco <dvelasco@owncloud.com>
Fri, 30 Oct 2015 12:59:02 +0000 (13:59 +0100)
Fixed  "Select Local Version" or "Keep Both behaviour" in conflict dialog


Trivial merge
ownCloud Android App