diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-09-23 22:42:34 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-09-23 22:42:34 +0000 |
| commit | 29dd8ab9c0ef28f9649fe0a5b29a0bbcfb4c0965 (patch) | |
| tree | 09ebc5e8d932fbedb7e5485d9de1e7f78fd7786c /CHANGELOG.md | |
| parent | 19263f30c3819f922586b537467e888574c334d7 (diff) | |
| parent | cf1960d5961a3a01a6d92c44ab4a6d0ce9570a09 (diff) | |
| download | pleroma-29dd8ab9c0ef28f9649fe0a5b29a0bbcfb4c0965.tar.gz pleroma-29dd8ab9c0ef28f9649fe0a5b29a0bbcfb4c0965.zip | |
Merge branch 'feature/force-password-reset' into 'develop'
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9aabe20d3..649fbc0be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] ### Added - Refreshing poll results for remote polls +- Admin API: Add ability to require password reset + ### Changed - **Breaking:** Elixir >=1.8 is now required (was >= 1.7) - Replaced [pleroma_job_queue](https://git.pleroma.social/pleroma/pleroma_job_queue) and `Pleroma.Web.Federator.RetryQueue` with [Oban](https://github.com/sorentwo/oban) (see [`docs/config.md`](docs/config.md) on migrating customized worker / retry settings) |