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)
commit09a349346c331f88e0e61d9f306d7344dcccbf71
treedb5c026ad4b190041247f3daa1fb48487498bc7a
parentb9ef747a0be9e50d50b709474daf9dca47d60f5f
parent3444d61be813114be86c0a77d364189013c12e32
Merge pull request #1219 from owncloud/sync_full_folder__fix_conflict_save_local_version

Fixed  "Select Local Version" or "Keep Both behaviour" in conflict dialog