Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Sat, 21 Nov 2015 08:35:19 +0000 (09:35 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sat, 21 Nov 2015 08:35:19 +0000 (09:35 +0100)
commit45e95d494dca25b857d15d384d6d0e1d4cbf2899
tree1e1cc32aa50864e049b3e5524c19a9d8208c28ba
parentb1df33a8066fe756f09aab140775f21163489a5e
parent2aac1e527034960dde1910fa5eaa88bc13dc2ee7
Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
owncloud-android-library
res/values-th-rTH/strings.xml
src/com/owncloud/android/authentication/AuthenticatorActivity.java
src/com/owncloud/android/operations/UploadFileOperation.java