krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,543 Commits 64 Branches 1,226 Tags
a7232b5abe31e0f1368437e864d1941bf1b976c2
Commit Graph

3 Commits

Author SHA1 Message Date
Blade Barringer
8ac9dc3ced Merge branch 'develop' into common-convert 2015-02-10 16:27:46 -06:00
Blade Barringer
dca2f13dda Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 
Conflicts:
	bower.json
	public/manifest.json
	src/controllers/auth.js
 2015-02-05 11:20:40 -06:00
Blade Barringer
d2eafdd021 Started moving public folder stuff back to website 2015-02-03 14:02:34 -06:00