Tyler Renelle 928f7cfdd7 Merge remote-tracking branch 'origin/sabe/rebirth' into develop ...

Conflicts:
	src/models/user.js
	views/shared/modals/index.jade

2013-12-31 08:04:51 -07:00

..

controllers

Merge remote-tracking branch 'origin/sabe/rebirth' into develop

2013-12-31 08:04:51 -07:00

directives

bosses: pretty things up amongst the modals, etc. Move rewards to a

2013-12-24 23:30:48 -07:00

filters

Revert b4ff7d4 b20a3b7 . Temporarily remove

2013-12-30 10:19:57 -07:00

services

Merge remote-tracking branch 'origin/sabe/rebirth' into develop

2013-12-31 08:04:51 -07:00

app.js

cleanup some inventory tabs. now it's inventory > drops, pet, mounts, equipment

2013-12-17 16:51:27 -07:00

static.js

MOBILE_APP on static, deep-watch user.items.gear.equipped

2013-12-15 23:17:09 -07:00