Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Sun, 13 Sep 2015 19:17:38 +0000 (21:17 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Sun, 13 Sep 2015 19:17:38 +0000 (21:17 +0200)
commit728590437134a90aede2bb9b641268fd0f467897
tree13947c0c573420c361ff862210923507462ea136
parent43a01cad8179bd420003791b6af7faeb61cfb857
parent83eed1a8d85df39db4565ba23bdebcb49642dcd4
Merge branch 'master' of https://github.com/owncloud/android into material_fab