negue 31ef21f25c Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm ...

# Conflicts:
#	website/client/store/actions/chat.js

2018-06-25 18:47:47 +02:00

..

GET-achievements.test.js

API v4 (WIP) (#10453)

2018-06-18 14:40:25 +02:00

GET-members_id.test.js

API v4 (WIP) (#10453)

2018-06-18 14:40:25 +02:00

GET-objections_interaction.test.js

API v4 (WIP) (#10453)

2018-06-18 14:40:25 +02:00

POST-flag_private_message.test.js

pass userId for admin-calls

2018-06-11 22:39:07 +02:00

POST-send_private_message.test.js

API v4 (WIP) (#10453)

2018-06-18 14:40:25 +02:00

POST-transfer_gems.test.js

API v4 (WIP) (#10453)

2018-06-18 14:40:25 +02:00