Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 27 Oct 2015 13:00:52 +0000 (14:00 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 27 Oct 2015 13:00:52 +0000 (14:00 +0100)
commit477c7a6b0a7c6b8300db4e3bedd890eaba718124
tree73a6189280d0b543e2f0763b1898e7283971b3c2
parentee67e0218d91e86e227d79b9ce6877d64101cd50
parent3918ec18a8f7c145c732702c7fc8572f892f4b5b
Merge branch 'master' of https://github.com/owncloud/android into material_fab