summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-02-20 15:00:48 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-02-20 15:00:48 +0300
commit0c65a8c3d02a5a9dc3a0a54fef3b86130cf3c0dd (patch)
tree0e0f2ad4f7317b44e11f1df4d2e5fc9a301007e1 /CHANGELOG.md
parent343229465753ebcc59002a2dd604a910a8ce462d (diff)
parente0b2de63853e9a14b72faddf6e1180a098728205 (diff)
downloadpleroma-0c65a8c3d02a5a9dc3a0a54fef3b86130cf3c0dd.tar.gz
pleroma-0c65a8c3d02a5a9dc3a0a54fef3b86130cf3c0dd.zip
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
# Conflicts: # config/config.exs
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bdd6ec432..e0ab69d8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,6 +72,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- User notification settings: Add `privacy_option` option.
- Support for custom Elixir modules (such as MRF policies)
- User settings: Add _This account is a_ option.
+- A new users admin digest email
- OAuth: admin scopes support (relevant setting: `[:auth, :enforce_oauth_admin_scope_usage]`).
- ActivityPub: support for `replies` collection (output for outgoing federation & fetching on incoming federation).
<details>