Commit graph

6 commits

Author SHA1 Message Date
hairlessbear
52d869b195 Fixed issue #5203 2015-05-16 16:52:58 -04:00
Sabe Jones
d50d4ad8bb feat(Spring): Flung 2015-05-01 19:09:28 -05:00
Sabe Jones
9722af679d feat(customize): Spring Colors 2015-03-28 16:22:52 -05:00
Blade Barringer
477d3d6085 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 2015-02-12 13:32:23 -06:00
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
Blade Barringer
8a8ce8d80d Moved folders to website directory 2015-02-03 14:10:55 -06:00
Renamed from views/options/profile.jade (Browse further)