Alice Harris ecd61ee602 Merge branch 'develop' of https://github.com/lynnyliz/habitrpg into lynnyliz-develop ...

Conflicts:
	views/options/inventory/stable.jade

2014-10-06 11:36:32 +10:00

..

main

fix(sortable): revert back to jqueryUI, fixes #3946

2014-08-28 16:32:05 -06:00

options

Merge branch 'develop' of https://github.com/lynnyliz/habitrpg into lynnyliz-develop

2014-10-06 11:36:32 +10:00

shared

fix(spookDust): rename to spooky sparkles

2014-10-03 13:24:55 -06:00

static

feat(auth): allow logging in with either username or email address

2014-09-02 12:23:29 -06:00

index.jade

fix bug music not playing if music menu not open + integrate daily/todo/reward sounds

2014-08-09 17:29:56 +09:00