Merge branch 'avoidDuplicateFiles' of https://github.com/owncloud/android into beta
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 30 Nov 2015 13:24:08 +0000 (14:24 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 30 Nov 2015 13:24:08 +0000 (14:24 +0100)
commitbd93cc1d66ecbc932493baf194037c8499329fae
treed4715ef1b5a6861c9954f9bcc6262db0ecebc08b
parent2c7ccd7bed5b4fccbce4488327133886c5a4a487
parent4f7d416b81d42e26b7c36d673f76ddf460f4500e
Merge branch 'avoidDuplicateFiles' of https://github.com/owncloud/android into beta