Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:49:00 +0000 (18:49 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:49:00 +0000 (18:49 +0100)
commitcc05129c903b9e6bb7e00af479cb61ce203d3b63
tree2d9388df3660a35d933115f6f2e88937af6c0769
parentc7a3b092ceb08ad2f74d66d660cf82244c328311
parente61641b39df804db56197d36530dbddd145a91c9
Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
CHANGELOG.md
res/layout/upload_files_layout.xml
res/values/strings.xml
res/xml/preferences.xml
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/ui/activity/UploadFilesActivity.java