Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Wed, 14 Oct 2015 08:33:49 +0000 (10:33 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Wed, 14 Oct 2015 08:33:49 +0000 (10:33 +0200)
commit2610eb6805a834f9c5a938899c429355cd6791af
tree968beb9cd43ee83b037a4faacf0cd3c0fcc1808e
parente5a61893ecb2b65f7a52651c01a34bdbd8d14416
parentc47b0ab77ac00c001eb649141c0c3a24587164ba
Merge branch 'master' of https://github.com/owncloud/android into material_buttons