From: tobiasKaminsky Date: Fri, 27 Nov 2015 16:47:46 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta X-Git-Tag: beta-20151128~8 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/60c534e81b503fd8169fe1e7d19ea63e32c8fc03?ds=inline;hp=--cc Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta --- 60c534e81b503fd8169fe1e7d19ea63e32c8fc03