Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Wed, 16 Sep 2015 15:38:17 +0000 (17:38 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Wed, 16 Sep 2015 15:38:17 +0000 (17:38 +0200)
commitd78077de4da35f0104457c60675421c3f01ba396
treebb5294722759acb02b8cce6bb723bcdd888aac05
parent9f8e478865fafabc7405671ad6c768b7e035107a
parentbbbb7026b4809f22ec4964c2789c3a57627cba3c
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab

Conflicts:
src/com/owncloud/android/authentication/AuthenticatorActivity.java