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

# Conflicts:
#	website/server/controllers/api-v3/quests.js
#	website/server/controllers/api-v3/tasks/groups.js
#	website/server/controllers/api-v3/user/spells.js
#	website/server/models/group.js

2018-04-25 21:15:49 +09:00

..

controllers

Merge branch 'develop' into party-chat-translations

2018-04-25 21:15:49 +09:00

libs

Move Chat to Model (#9703)

2018-04-23 12:17:16 -05:00

middlewares

Preparatory Work for Smaller user doc (WIP) (#10245)

2018-04-12 21:17:47 +02:00

models

Merge branch 'develop' into party-chat-translations

2018-04-25 21:15:49 +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

Node 8 (WIP) (#9946)

2018-03-15 19:59:36 +01:00

server.js

Stringified mem report (#10167)

2018-03-23 10:19:24 -05:00