From: Andy Scherzinger Date: Mon, 30 Nov 2015 13:24:08 +0000 (+0100) Subject: Merge branch 'avoidDuplicateFiles' of https://github.com/owncloud/android into beta X-Git-Tag: beta-20151202~5^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/bd93cc1d66ecbc932493baf194037c8499329fae Merge branch 'avoidDuplicateFiles' of https://github.com/owncloud/android into beta --- bd93cc1d66ecbc932493baf194037c8499329fae