2 Commits

Author	SHA1	Message	Date
Blade Barringer	45d1fb4c6e	Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert ... Conflicts: common/dist/scripts/habitrpg-shared.js	2015-02-09 22:18:22 -06:00
Blade Barringer	c8124f28ed	Set it so compiled js and sprites are not ignored	2015-02-09 16:04:25 -06:00