Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 4 Aug 2015 09:47:44 +0000 (11:47 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 4 Aug 2015 09:47:44 +0000 (11:47 +0200)
commit3c78d4fcfbde357bf39f452b3442684e3c34f204
treecc5af4e486e86d33f7fff457cbd10de88c840af1
parenta51fcd31a79e32abb75b1bec9379be248a64ed78
parent04f70fa8c9b751b648e916698a1981e1d773ba09
Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar