projects / pub / Android / ownCloud.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c13741b cbb0f87)
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 18 Aug 2015 21:20:01 +0000 (23:20 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 18 Aug 2015 21:20:01 +0000 (23:20 +0200)
commit7f13b98cc06723b129c7fff05fed188612a9f100
treea97b24e74eb7c8a2974b039574603c5f5d7469c4tree | snapshot (tar.gz tar.bz2 zip)
parentc13741ba2056f175978ecdbc05b81cf473781e3dcommit | diff
parentcbb0f8743ffc081f01886dad9cb02470351a2dabcommit | diff
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons

Conflicts:
res/layout-land/account_setup.xml
res/layout/account_setup.xml
res/values/styles.xml diff1 | diff2 | blob | history
src/com/owncloud/android/authentication/AuthenticatorActivity.java diff1 | diff2 | blob | history
ownCloud Android App