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

..

challenge.test.js

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

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

group_tasks.test.js

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

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

group.test.js

Merge branch 'develop' into party-chat-translations

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

task.test.js

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

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

user.test.js

Node 8 (WIP) (#9946)

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

userNotification.test.js

notifications: fixes

2018-02-04 13:28:05 +01:00

webhook.test.js

Revert "moving developer-only strings to api messages (#10188)"

2018-04-15 17:09:15 +00:00