Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Sun, 22 Nov 2015 11:19:17 +0000 (12:19 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sun, 22 Nov 2015 11:19:17 +0000 (12:19 +0100)
commit0bd47a3fb5629f49bbcb72f7860a7fefcf17c9c0
tree637fb727674253061d96dcc3ff9a375514709a00
parentaaa8939b801ad30f5943128b9f17783b5be859b3
parent4471d3beb9df3cce825f5be6920c181f3cd75198
Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java