jjbillings 2b1f63ccd2 Sync from main repo ... # Conflicts: # Habitica/res/values/strings.xml Conflicts resolved		2016-08-21 19:45:54 -05:00
..
attrs_avatar_view.xml	feat: add GIF supported AvatarView	2016-05-23 13:00:16 +08:00
colors.classes.xml	make spacing and sizing more consistent	2016-03-16 13:52:42 +01: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	highlight equipped gear	2016-03-10 14:34:35 +01:00
dimens.xml	spacing and icon tweaks	2016-08-11 18:06:55 +02:00
strings.constants.xml	Moved strings to contants file. Ensured constants will not be translated.	2016-08-02 13:31:19 -05:00
strings.profile.xml	use APIHelper in ContentCache, get language from user.preferences, use common card-styles,	2016-08-12 22:17:02 +02:00
strings.sidebar.xml	display shops in the app	2016-07-22 18:07:00 +02:00
strings.tutorial.xml	Display tutorial messages	2016-02-02 15:02:26 +01:00
strings.xml	Sync from main repo	2016-08-21 19:45:54 -05:00
styles.xml	Initial apiv3 support	2016-05-09 17:23:39 +02:00
values.xml	update translations	2016-05-14 11:56:49 +02:00