projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c7ccd7 4f7d416)
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)

Trivial merge
ownCloud Android App