Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 2 Dec 2015 19:28:56 +0000 (20:28 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 2 Dec 2015 19:28:56 +0000 (20:28 +0100)
commitdeb1e48fc01a9750cc55429ff290e6f6ac025bf4
treea23f29ef98943e9a73cd7ebf0c6fe24b2e4ad041
parent2eecb46250300a470fa20caee27b2b04a1e0ea49
parent9e678fc697cd2722afa3487058af6a9c06bf2f27
Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
res/values/strings.xml
res/xml/preferences.xml
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
tests/project.properties