habitica/website/views
Sabe Jones 95ee19b4ca Merge branch 'taldin/faq-wiki-links' into develop
Conflicts:
	common/dist/sprites/habitrpg-shared.css
2016-01-19 13:50:35 -05:00
..
main Adjust PR #5389 2015-06-12 09:05:06 -05:00
options Fix for issue #5182: Allow cancel editing group infobox 2016-01-18 22:39:06 -06:00
shared Merge branch 'taldin/faq-wiki-links' into develop 2016-01-19 13:50:35 -05:00
social Add icon for pinned Safari tabs 2016-01-14 20:32:51 -06:00
static Merge branch 'taldin/faq-wiki-links' into develop 2016-01-19 13:50:35 -05:00
avatar-static.jade add TODO comments, send mods to client as they are used there 2015-08-14 21:05:04 +02:00
index.jade Add icon for pinned Safari tabs 2016-01-14 20:32:51 -06:00