Alice Harris 7660141365 Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01 ...

Conflicts:
	views/shared/tasks/lists.jade
	views/shared/tasks/task.jade

2015-01-11 14:15:55 +10:00

..

header

Rounds tooltip for exp, health and mana to 2 decimal places

2015-01-06 13:52:22 -06:00

modals

Merge pull request #4478 from crookedneighbor/cmd-enter-for-chat

2015-01-09 13:51:21 -06:00

profiles

fix(world-boss): Achievement badge

2015-01-08 15:47:48 -06:00

tasks

Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01

2015-01-11 14:15:55 +10:00

footer.jade

Merge branch 'Alys-communityGuidelines' into develop

2014-10-27 16:20:30 -06:00

formatting-help.jade

Replace hard coded strings for env.t on views/shared/ folder.

2013-12-31 00:15:53 -02:00

mixins.jade

Add behaviour specific to the buy-gems popup.

2015-01-02 00:01:44 +00:00

new-stuff.jade

feat(event): World boss

2015-01-08 15:22:42 -06:00