habitica/common/script
Alice Harris 1432d2a61a Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03
Conflicts:
	common/dist/scripts/habitrpg-shared.js
	common/script/content.coffee
	common/script/index.coffee
2015-03-28 12:40:46 +10:00
..
public remove growl notification about party settings saved after changing party order (not needed now that avatars in head are resorted immediately) 2015-03-22 17:50:22 +10:00
content.coffee Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03 2015-03-28 12:40:46 +10:00
i18n.coffee Repair Broken Test Suite - Full Passing Tests 2015-03-24 21:39:03 -04:00
index.coffee Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03 2015-03-28 12:40:46 +10:00