Merge branch 'download_folder' into download_folder__fixing_recursive_cancellation
authorjabarros <jabarros@solidgear.es>
Thu, 8 Jan 2015 13:26:38 +0000 (14:26 +0100)
committerjabarros <jabarros@solidgear.es>
Thu, 8 Jan 2015 13:26:38 +0000 (14:26 +0100)
commit46d045fd62a7637baa84561ccf2ccb726a02f607
tree49816c952da87050528fe73bf5ceb5b6c79d2ee7
parent14bbe5bf01b8983de8011f217356b40d912bd4a1
parentd05d5ffe1a5b7a4f470afa541515a0b9c7eb9f59
Merge branch 'download_folder' into download_folder__fixing_recursive_cancellation
src/com/owncloud/android/operations/SynchronizeFolderOperation.java