Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 3 Aug 2015 19:38:32 +0000 (21:38 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 3 Aug 2015 19:38:32 +0000 (21:38 +0200)
commit6235022b5632a7d3f39c23032816dbe7dd04ad4c
tree8348c0569164feafd935eed44c9c473e961f67ba
parentbfea14e876c9f95584a1b6eac3a5abb01f91b741
parent519ba0393cc9054e6426ac7bdf8dab944a6df168
Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar