Alice Harris ab66f95c8e Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12 ...

Conflicts:
	dist/habitrpg-shared.js

2015-01-06 15:26:59 +10:00

..

achievements

feat(NYE): Image resources

2014-12-29 20:17:47 -06:00

backgrounds

Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12

2015-01-06 15:26:59 +10:00

customize

feat(NYE): Image resources

2014-12-29 20:17:47 -06:00

gear

Merge pull request #425 from SabreCat/nye

2014-12-30 22:17:23 -06:00

misc

chore(January): Jan updates

2015-01-01 23:18:18 -06:00

npcs

chore(January): Jan updates

2015-01-01 23:18:18 -06:00

promo

feat(NYE): Image resources

2014-12-29 20:17:47 -06:00

quests

Merge branch 'issue-3954' of https://github.com/ebiagogo/habitrpg-shared into ebiagogo-issue-3954

2014-12-30 14:47:22 -06:00

shop

Adjusted position of ghost and snowball

2014-12-31 09:14:29 -06:00

stable

Merge branch 'issue-3954' of https://github.com/ebiagogo/habitrpg-shared into ebiagogo-issue-3954

2014-12-30 14:47:22 -06:00