7 Commits

Author	SHA1	Message	Date
Blade Barringer	8ac9dc3ced	Merge branch 'develop' into common-convert	2015-02-10 16:27:46 -06:00
Blade Barringer	17032a4f13	Reverted changes back into website/src	2015-02-10 16:06:32 -06:00
Blade Barringer	bf4f2299e2	Moved src to website/src (again)	2015-02-10 16:04:17 -06:00
Blade Barringer	e243887563	Deleted website/src	2015-02-10 16:03:11 -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	220942fb9d	Corrected path to common files	2015-02-03 14:17:21 -06:00
Blade Barringer	8a8ce8d80d	Moved folders to website directory	2015-02-03 14:10:55 -06:00