Merge branch 'target_marshmallow' of https://github.com/owncloud/android into beta
authorAndy Scherzinger <info@andy-scherzinger.de>
Sat, 28 Nov 2015 10:48:57 +0000 (11:48 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Sat, 28 Nov 2015 10:48:57 +0000 (11:48 +0100)
Conflicts:
build.gradle


No differences found