Sabe Jones eed4207c6d Merge branch 'develop' into sabrecat/more-modals ...

Conflicts:
	common/dist/sprites/spritesmith-largeSprites-0.png
	common/locales/en/front.json

2015-11-09 16:24:17 -05:00

..

api.jade

HabitRPG -> Habitica

2015-08-03 19:24:24 +00:00

apps.jade

chore(news): iOS update Bailey

2015-11-05 11:48:51 -05:00

community-guidelines.jade

Update habitrpg.com to habitica.com where applicable

2015-08-19 08:00:34 -05:00

contact.jade

Fix capitalization of “GitHub” on Contact Us page

2015-10-14 03:55:46 -04:00

faq.jade

add FAQ item for World Bosses

2015-10-12 21:26:59 +10:00

features.jade

Correct class name

2015-08-30 17:52:16 -05:00

front.jade

fix(front-page): Remove extra script tag

2015-10-29 17:07:41 -04:00

layout.jade

Remove container class

2015-09-04 16:47:12 -05:00

login-modal.jade

fix(sharing): Landing page tweaks

2015-11-03 16:16:17 -05:00

new-stuff.jade

stringify into window.env only what we really need, save a lot of KBs

2015-08-14 14:53:17 +02:00

old-news.jade

Remove container class

2015-09-04 16:47:12 -05:00

overview.jade

fix(overview): Wording and layout tweaks

2015-11-05 14:18:51 -05:00

plans.jade

Update habitrpg.com to habitica.com where applicable

2015-08-19 08:00:34 -05:00

press-kit.jade

Update names

2015-10-29 08:07:06 -05:00

privacy.jade

Fix habitica in privacy policy

2015-08-19 08:06:02 -05:00

terms.jade

Update habitrpg.com to habitica.com where applicable

2015-08-19 08:00:34 -05:00

videos.jade

Moved folders to website directory

2015-02-03 14:10:55 -06:00