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

Conflicts:
	src/controllers/groups.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/models/user.js

2015-02-09 22:21:27 -06:00

..

controllers

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

2015-02-09 22:21:27 -06:00

directives

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

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

filters

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

services

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

2015-02-09 22:21:27 -06:00

app.js

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

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

env.js

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

static.js

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00