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

Remove extraneous techy characters from boss fight and spellcasting chat notifications

2013-12-30 08:46:40 -06:00

models

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

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

routes

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

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

middleware.js

remove console.log

2013-12-30 12:28:30 +01:00

seed.js

updated README to show initial seeding tasks, and fixed a small typo

2013-11-09 08:48:38 -08:00

server.js

server: move config => utils, send headers along with error. Trying to

2013-12-28 14:52:21 -07:00

utils.js

quest: add quest leader. only quest-leader can begin/abort. Abort

2013-12-28 16:36:16 -07:00