Merge branch 'beta' of github.com:owncloud/android into beta
authortobiasKaminsky <tobias@kaminsky.me>
Sun, 29 Nov 2015 19:12:20 +0000 (20:12 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sun, 29 Nov 2015 19:12:20 +0000 (20:12 +0100)
commit26b1864940df7c02b1941355034fe83edd1d6bd2
tree8b31a9c51d556c57fee0028afde884f3262d7c82
parentf4f6c0b4a458770aca1da55a249fc8ac8fe8522b
parent023ffebc64277b2628b7c2c88a0424d686844dbf
Merge branch 'beta' of github.com:owncloud/android into beta
AndroidManifest.xml
build.gradle