Merge branch 'develop' into setup_buttons
authormasensio <masensio@solidgear.es>
Tue, 29 Oct 2013 13:13:24 +0000 (14:13 +0100)
committermasensio <masensio@solidgear.es>
Tue, 29 Oct 2013 13:13:24 +0000 (14:13 +0100)
commitc2abbaaedb69dba35866a48b745b68f3519cbca1
treec4163abde4d5bdfb7812ba1556b6d7efbef0d303
parent6ace8ab1c18b23a4c016986256075cfda8e50104
parentc217f7229b1224a7fc5526ddfad928cd73ebf1f3
Merge branch 'develop' into setup_buttons
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileObserverService.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java