Blade Barringer dca2f13dda Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert ...

Conflicts:
	bower.json
	public/manifest.json
	src/controllers/auth.js

2015-02-05 11:20:40 -06:00

..

api.jade

Moved folders to website directory

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

community-guidelines.jade

Moved folders to website directory

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

contact.jade

Moved folders to website directory

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

features.jade

Moved folders to website directory

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

front.jade

Moved folders to website directory

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

layout.jade

Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert

2015-02-05 11:20:40 -06:00

login-modal.jade

Moved folders to website directory

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

new-stuff.jade

Moved folders to website directory

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

old-news.jade

Moved folders to website directory

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

plans.jade

Moved folders to website directory

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

press-kit.jade

Moved folders to website directory

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

privacy.jade

Moved folders to website directory

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

terms.jade

Moved folders to website directory

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

videos.jade

Moved folders to website directory

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