Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Wed, 7 Oct 2015 17:03:23 +0000 (19:03 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Wed, 7 Oct 2015 17:03:23 +0000 (19:03 +0200)
commit41a883549f9158ea7b3a6c36c33d1a290d9f7745
tree95fce40a1a2fc6aa858cf045ccd39c821109f36c
parent5417b2a4e5114686aa1f9fadb55a6d464947acb8
parent567355eed079c0fe301bf6f8d2117d39ce537c6f
Merge branch 'master' of https://github.com/owncloud/android into material_buttons