Phillip Thelen 6c44e997e2 Merge branch 'settings_page_fixes' of git://github.com/andrewlord1990/habitrpg-android into andrewlord1990-settings_page_fixes ... # Conflicts: # Habitica/res/values/colors.xml		2016-03-05 14:57:23 +01:00
..
colors.classes.xml	Party Part 2 - Memberlist / Fix Avatars	2015-09-23 22:39:04 +02:00
colors.contributor.xml	List Tavern Messages, Send / Delete them, Toggle Sleep	2015-08-30 19:56:46 +02:00
colors.tavern.xml	improve readability for +1 in chat	2015-12-09 03:22:21 +01:00
colors.xml	Merge branch 'settings_page_fixes' of git://github.com/andrewlord1990/habitrpg-android into andrewlord1990-settings_page_fixes	2016-03-05 14:57:23 +01:00
dimens.xml	fix scaling for customizations	2016-01-20 15:31:34 +01:00
library_paperboy_strings.xml	[#184] Add paperboy to about libraries	2015-12-12 18:51:28 +01:00
secret_strings.xml	Fix for broken travis build	2016-02-05 14:00:51 -06:00
strings.constants.xml	extract constant strings	2016-01-11 20:29:05 +01:00
strings.sidebar.xml	Display skills	2015-11-25 18:47:56 +01:00
strings.tutorial.xml	Display tutorial messages	2016-02-02 15:02:26 +01:00
strings.xml	Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into develop	2016-03-05 14:56:24 +01:00
styles.xml	Fixed material styling on the preferences pages.	2016-02-27 22:46:32 +00:00
values.xml	Display current avatar customization	2016-01-12 17:08:02 +01:00