Merge branch 'mongooseim-support' into 'develop'
authorkaniini <nenolod@gmail.com>
Wed, 22 May 2019 04:06:54 +0000 (04:06 +0000)
committerkaniini <nenolod@gmail.com>
Wed, 22 May 2019 04:06:54 +0000 (04:06 +0000)
commit79c2cef2fbcbac99cce001376b8231e0e0a9adf4
treed3e994e4930638103d8a8fea5e6ac14ad61dfb7c
parentab6e15622b0977a50408f4afb874e0b5b1704d2f
parentd378b342ba0d7f54be3b47f031c602a578191dfd
Merge branch 'mongooseim-support' into 'develop'

MongooseIM: Add basic integration endpoints.

See merge request pleroma/pleroma!1172
CHANGELOG.md
config/config.exs
lib/pleroma/web/router.ex