Mateus Etto d2fcdf4493 Merge branch 'develop' into party-chat-translations ...

# Conflicts:
#	website/server/controllers/api-v3/user.js

2018-02-26 19:55:32 +09:00

..

controllers

Merge branch 'develop' into party-chat-translations

2018-02-26 19:55:32 +09:00

libs

Bulk spell casting (#10007)

2018-02-23 11:30:15 -07:00

middlewares

Upgrade tests tools and lint migrations and scripts (part 2) (#9998)

2018-02-17 18:11:24 +01:00

models

Merge branch 'develop' into party-chat-translations

2018-02-26 19:55:32 +09:00

.eslintrc

Upgrade ESLint to v3 (#8299)

2016-12-20 22:31:36 +01:00

api-doc.js

Improved API documentation for hall #8087 (#8536)

2017-06-06 11:48:11 -07:00

index.js

remove newrelic

2017-02-05 18:43:00 +01:00

server.js

fix: move attachMiddlwares function so mongoose models have tx strings

2016-09-12 20:40:12 -05:00