diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-04-17 09:05:27 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-04-17 09:05:27 +0000 |
| commit | 8de17c480e4267a46ae8d862a3c8918aa6734c39 (patch) | |
| tree | c6799271aa6839230b39baa4f7372eb43f0d5de9 | |
| parent | 73df3046e014ae16e03f16a9c82921652cefcb54 (diff) | |
| parent | 2198e54d28f1e1c5a2f2d39426f1bdcc97c00213 (diff) | |
| download | pleroma-8de17c480e4267a46ae8d862a3c8918aa6734c39.tar.gz | |
Merge branch '788-notify-email-changelog' into 'develop'
changelog info
See merge request pleroma/pleroma!1070
| -rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d2ad3320..21ad83a01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Configuration: `safe_dm_mentions` option - Configuration: `link_name` option - Configuration: `fetch_initial_posts` option +- Configuration: `notify_email` option - Pleroma API: User subscribtions - Admin API: Endpoints for listing/revoking invite tokens - Admin API: Endpoints for making users follow/unfollow each other |