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)
commitc94b5314b750083451bfc2587c5a492a057a88c4
tree47e6688ccafc01b10c4c26c090326f2ace19a23d
parent7e893e6ecbe15b28274a468d5b605f70176f174c
parentf8ed0f6ae79c9d174dd082d3ac9101a6f8859842
Merge branch 'target_marshmallow' of https://github.com/owncloud/android into beta

Conflicts:
build.gradle
.travis.yml
AndroidManifest.xml
build.gradle