Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles_Master
authortobiasKaminsky <tobias@kaminsky.me>
Sat, 21 Nov 2015 07:48:40 +0000 (08:48 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sat, 21 Nov 2015 07:48:40 +0000 (08:48 +0100)
commit2aac1e527034960dde1910fa5eaa88bc13dc2ee7
treeb7988389ebdb2901faa5bc2ac175b4acb8b5c743
parente61641b39df804db56197d36530dbddd145a91c9
parent08be3d3433b65d0858dc1503a82ed5a3ba655d36
Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles_Master
res/values/strings.xml
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/UploadFileOperation.java