Tyler Renelle 18ccbb51df Merge remote-tracking branch 'colegleason/drops' into develop ...

Conflicts:
	dist/habitrpg-shared.js

2014-01-15 17:40:07 -07:00

..

customizer.css

feat(perfect-day achievement) here's one for the road @wc8 @sabrecat, if

2014-01-15 16:26:47 -07:00

habitrpg-shared.css

feat(perfect-day achievement) here's one for the road @wc8 @sabrecat, if

2014-01-15 16:26:47 -07:00

habitrpg-shared.js

Merge remote-tracking branch 'colegleason/drops' into develop

2014-01-15 17:40:07 -07:00

spritesmith-1389828292972.png

feat(perfect-day achievement) here's one for the road @wc8 @sabrecat, if

2014-01-15 16:26:47 -07:00

spritesmith.css

feat(perfect-day achievement) here's one for the road @wc8 @sabrecat, if

2014-01-15 16:26:47 -07:00