Merge branch 'master' of https://github.com/owncloud/android into material_toolbar
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 17 Aug 2015 14:13:30 +0000 (16:13 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 17 Aug 2015 14:13:30 +0000 (16:13 +0200)
commit3a82db451cfb855b7307d696214e51a02663f97b
treef65768c2d7e01c24f31d1108c01c65c8d17cd329
parent4ff231f25653bb6659fc2efa371a59b90e0c37a8
parentba4b2586974ba69549dd395435924da233c6d1e6
Merge branch 'master' of https://github.com/owncloud/android into material_toolbar