Merge branch 'develop' into refresh_folder_contents_when_browsed_into
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 18 Oct 2013 10:28:09 +0000 (12:28 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 18 Oct 2013 10:28:09 +0000 (12:28 +0200)
commit7c9d9e7b3a56229f97cf1bf193f61d4aedd09806
tree0d45d0e1fb3d40b4cade9a5f5f1014bc8fcb4228
parent8bd6f85e227c5ac148beb014a1ddb04755bdb619
parent881727f0504f223e1b878ee1b4cb87c9f73f9546
Merge branch 'develop' into refresh_folder_contents_when_browsed_into
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/SynchronizeFileOperation.java
src/com/owncloud/android/operations/SynchronizeFolderOperation.java