Commit graph

6 commits

Author SHA1 Message Date
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
28b9ad11cb Added paths for common scripts 2015-02-04 13:22:41 -06:00
Blade Barringer
5d9cda3b76 Corrected some paths to serve files directly from comon 2015-02-04 12:25:14 -06:00
Blade Barringer
44a89dd0bd Corrected sprite task 2015-02-03 19:29:22 -06:00
Blade Barringer
bf6fdf8d9d Updated paths 2015-02-03 18:55:17 -06:00
Blade Barringer
d2eafdd021 Started moving public folder stuff back to website 2015-02-03 14:02:34 -06:00
Renamed from common/public/manifest.json (Browse further)