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

# Conflicts:
#	test/api/unit/models/group.test.js
#	website/server/controllers/api-v3/user/spells.js
#	website/server/models/chat.js
#	website/server/models/group.js

2018-10-08 18:44:02 +09:00

..

controllers

Merge branch 'develop' into party-chat-translations

2018-10-08 18:44:02 +09:00

libs

Merge branch 'develop' into party-chat-translations

2018-10-08 18:44:02 +09:00

middlewares

Move inbox to its own model (#10428)

2018-09-21 15:12:20 +02:00

models

Merge branch 'develop' into party-chat-translations

2018-10-08 18:44:02 +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 stackimpact

2018-04-30 19:07:46 +02:00

server.js

Api quest restrictions - no purchase/start without fulfilling eligibility requirements (#10387)

2018-05-27 16:41:56 +02:00