Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 27 Nov 2015 16:47:46 +0000 (17:47 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 27 Nov 2015 16:47:46 +0000 (17:47 +0100)
commit60c534e81b503fd8169fe1e7d19ea63e32c8fc03
tree5fbfc627c010575e2116014de17e06537a16c49b
parent0510376e7487756afd93e16634e9e67b277b5096
parent5d77cfc62d8f5018b44adc4832d372674c956128
Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
src/com/owncloud/android/operations/UploadFileOperation.java