Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Wed, 14 Oct 2015 08:32:16 +0000 (10:32 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Wed, 14 Oct 2015 08:32:16 +0000 (10:32 +0200)
commit13bef89333593e198dd04db9344898683d8652d8
tree36fe6159c79857f17fb1cd7dc5ca2a5ea1cb8ee4
parent6b2053f004d55b776f8ca25b61171b2b56264662
parentc47b0ab77ac00c001eb649141c0c3a24587164ba
Merge branch 'master' of https://github.com/owncloud/android into material_fab