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

Conflicts:
	src/controllers/auth.js
	src/controllers/challenges.js
	src/controllers/groups.js
	src/controllers/members.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/middleware.js
	src/models/user.js

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

..

public

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

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

src

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

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

views

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

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