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

..

payments

API v4 (WIP) (#10453)

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

analyticsService.test.js

API v4 (WIP) (#10453)

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

apiError.js

API v4 (WIP) (#10453)

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

baseModel.test.js

API v4 (WIP) (#10453)

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

collectionManipulators.test.js

API v4 (WIP) (#10453)

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

cron.test.js

API v4 (WIP) (#10453)

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

email.test.js

API v4 (WIP) (#10453)

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

encryption.test.js

API v4 (WIP) (#10453)

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

errors.test.js

API v4 (WIP) (#10453)

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

i18n.test.js

API v4 (WIP) (#10453)

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

logger.js

API v4 (WIP) (#10453)

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

password.test.js

API v4 (WIP) (#10453)

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

preening.test.js

API v4 (WIP) (#10453)

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

pushNotifications.js

API v4 (WIP) (#10453)

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

setupNconf.test.js

API v4 (WIP) (#10453)

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

slack.js

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

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

taskManager.js

API v4 (WIP) (#10453)

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

webhooks.test.js

API v4 (WIP) (#10453)

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