Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Sun, 11 Oct 2015 10:30:05 +0000 (12:30 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Sun, 11 Oct 2015 10:30:05 +0000 (12:30 +0200)
commite5a61893ecb2b65f7a52651c01a34bdbd8d14416
tree01b99d4692fb4106fbb3c6bedcf172a57039eaf8
parent41a883549f9158ea7b3a6c36c33d1a290d9f7745
parent42f38fe8766d2782a7a65ee36168bcba6a2cadfd
Merge branch 'master' of https://github.com/owncloud/android into material_buttons