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

..

main

Moved folders to website directory

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

options

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

2015-02-03 21:13:55 -06:00

shared

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

2015-02-03 21:13:55 -06:00

static

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

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

avatar-static.jade

Moved folders to website directory

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

index.jade

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

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