Merge branch 'develop' into cancel_transfer_for_deleted_users
authormasensio <masensio@solidgear.es>
Thu, 19 Feb 2015 11:54:59 +0000 (12:54 +0100)
committermasensio <masensio@solidgear.es>
Thu, 19 Feb 2015 11:54:59 +0000 (12:54 +0100)
commitcb175f29949dbac17a3870a71ecff60df5c9bdc4
tree38e88077d61137a407ea1b6746a3d92b375a3382
parente93016d7e01ba4917fbf89193ac37373350dbb52
parentec6b9d7c70deb50152bfab5cb5f25c9a2dde28e7
Merge branch 'develop' into cancel_transfer_for_deleted_users

Conflicts:
AndroidManifest.xml
AndroidManifest.xml
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java