Tyler Renelle 3a5eda1e98 Merge remote-tracking branch 'origin/sabe/attributes' into develop ...

Conflicts:
	views/shared/footer.jade

2014-01-04 16:02:22 -07:00

..

controllers

challenges: add "official habitrpg challenge" option

2014-01-03 13:36:13 -07:00

models

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

2014-01-04 16:02:22 -07:00

routes

apiv2 swagger fixes to paypal, and send admin emails

2014-01-03 12:50:03 -07:00

middleware.js

use habitrpg-shared locales, removed old ones

2014-01-02 20:37:05 +01:00

seed.js

Fix seed file

2013-12-30 23:44:24 -08:00

server.js

#2217 merge apiv2 route definitions with swagger decorations

2014-01-01 20:21:46 -07:00

utils.js

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

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