krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,304 Commits 63 Branches 1,225 Tags
75c9b5a97814fcbe40887042bf0debf57ca89a47
Commit Graph

2 Commits

Author SHA1 Message Date
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
Blade Barringer
d2eafdd021 Started moving public folder stuff back to website 2015-02-03 14:02:34 -06:00