diff options
| author | kaniini <nenolod@gmail.com> | 2019-05-22 04:06:54 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-05-22 04:06:54 +0000 |
| commit | 79c2cef2fbcbac99cce001376b8231e0e0a9adf4 (patch) | |
| tree | d3e994e4930638103d8a8fea5e6ac14ad61dfb7c /CHANGELOG.md | |
| parent | ab6e15622b0977a50408f4afb874e0b5b1704d2f (diff) | |
| parent | d378b342ba0d7f54be3b47f031c602a578191dfd (diff) | |
| download | pleroma-79c2cef2fbcbac99cce001376b8231e0e0a9adf4.tar.gz pleroma-79c2cef2fbcbac99cce001376b8231e0e0a9adf4.zip | |
Merge branch 'mongooseim-support' into 'develop'
MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ed380102..3ff70e6e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [unreleased] ### Added +- [MongooseIM](https://github.com/esl/MongooseIM) http authentication support. - LDAP authentication - External OAuth provider authentication - A [job queue](https://git.pleroma.social/pleroma/pleroma_job_queue) for federation, emails, web push, etc. |