Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 28 Sep 2015 16:31:23 +0000 (18:31 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 28 Sep 2015 16:31:23 +0000 (18:31 +0200)
commit96e02ff0912b3cd725c96bd5729748fb86a39867
tree78ed2d49561940edf1a5f33dd63c72dea78e079d
parent6a192340bbfb06540043819dc3c8c9f5911020fe
parent4316d7082f69fd8f094caa68a3001b7ed9a43316
Merge branch 'master' of https://github.com/owncloud/android into material_fab