Andy Scherzinger a812784ddd Merge branch 'master' of https://github.com/owncloud/android into material_buttons ... Conflicts (resolved): res/layout/drawer.xml res/values/colors.xml res/values/setup.xml		2015-12-28 20:03:25 +01:00
..
attrs.xml	changed according to latest discussion	2015-12-01 22:00:53 +01:00
bools.xml	Update year in license	2015-03-05 13:27:45 +01:00
colors.xml	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-12-28 20:03:25 +01:00
dims.xml	merged part of the fixes from material buttons branch to fix bugs reported in PR #1076	2015-08-14 17:18:36 +02:00
drawer_resources.xml	Disable 'Accounts' in Navigation Drawer	2015-05-29 11:32:36 +02:00
oauth2_configuration.xml	Update packageName	2013-10-29 14:10:42 +01:00
setup.xml	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-12-28 20:03:25 +01:00
strings.xml	Merge pull request #1168 from owncloud/avoidDuplicateFiles	2015-12-09 09:27:54 +01:00
styles.xml	Make button colours easy to brand	2015-12-22 17:22:24 +01:00
versioned_styles.xml	fixed button style blue/grey	2015-08-12 18:54:27 +02:00