projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f8e478 bbbb702)
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)
Conflicts:
src/com/owncloud/android/authentication/AuthenticatorActivity.java


Trivial merge
ownCloud Android App