Tyler Renelle ea31cc6926 Merge branch 'task-li-notes' into develop ... Conflicts: views/shared/tasks/task.jade		2013-12-30 10:31:17 -07:00
..
header	winter event! npcs, snowball=>snowman, new hairs/beards. Fixes to beard/chin overlays. move Fortify Service => "Fortify Potion" Special. @sabrecat let me know what you think: http://gyazo.com/55cd424f104b8f3acb557b99d918cb4b). Sorry for mixing concerns in this commit, some rebase difficulties	2013-12-20 10:26:23 -07:00
modals	RPG demystification, cont'd	2013-12-29 20:58:35 -06:00
profiles	Fix #2181 (allocated points showing up in Class Equip Bonus)	2013-12-30 07:33:17 -06:00
tasks	Merge branch 'task-li-notes' into develop	2013-12-30 10:31:17 -07:00
footer.jade	Update Request Feature link	2013-12-27 19:21:30 -08:00
formatting-help.jade	Change Markdown help link to point at HabitRPG wiki	2013-11-24 13:13:21 -06:00
gems.jade	Merge branch 'classes' into develop	2013-12-08 18:17:53 -07:00