David A. Velasco f6ea9b597a Merge branch 'master' into reliable_uploads_actions_uploads_view ... Conflicts FIXED in res/values/styles.xml (trivial)		2016-03-30 13:27:09 +02: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	coloer changes for #1132	2016-02-25 18:07:11 +01:00
dims.xml	Polish UI to edit permissions	2016-01-11 15:34:41 +01:00
drawer_resources.xml	Uploads over settings in navigation drawer	2016-03-03 13:00:32 +01:00
oauth2_configuration.xml	Update packageName	2013-10-29 14:10:42 +01:00
setup.xml	Changed text color of secondary buttons to black	2016-02-04 14:51:54 +01:00
strings.xml	Merge branch 'master' into reliable_uploads_actions_uploads_view	2016-03-30 13:27:09 +02:00
styles.xml	Merge branch 'master' into reliable_uploads_actions_uploads_view	2016-03-30 13:27:09 +02:00
versioned_styles.xml	fixed button style blue/grey	2015-08-12 18:54:27 +02:00