Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
authorAndyScherzinger <info@andy-scherzinger.de>
Sun, 26 Jul 2015 20:35:28 +0000 (22:35 +0200)
committerAndyScherzinger <info@andy-scherzinger.de>
Sun, 26 Jul 2015 20:35:28 +0000 (22:35 +0200)
commitdbe0ff54aedb6eab3e9c596f48fc816ef7ee43e8
treec5fe36360699f88bf442e23bfce49a29185c62f1
parent77c5ce77b265c97d315d04caa4feb52c83ed1ebe
parentfcf4f1238da1b084aafdb88753eed511b948b54b
Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar