summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2020-10-27 22:55:31 +0000
committerfeld <feld@feld.me>2020-10-27 22:55:31 +0000
commit1204aaa2e35983f7361d61ee7906ccf3d09d84e4 (patch)
treeb7ece4fbca3ec8f309a3c58cf27087a20546b31c /CHANGELOG.md
parentd8d4bd15d064e44d9900b91696a1ca2c373fcfc8 (diff)
parent03a318af9ac1cc86e1201d6f55babd06c0b5ecd9 (diff)
downloadpleroma-1204aaa2e35983f7361d61ee7906ccf3d09d84e4.tar.gz
pleroma-1204aaa2e35983f7361d61ee7906ccf3d09d84e4.zip
Merge branch 'feature/autofollowing' into 'develop'
autofollowing_nicknames See merge request pleroma/pleroma!3087
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 6ca56a90d..9af4a15cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Pleroma API: Importing the mutes users from CSV files.
- Experimental websocket-based federation between Pleroma instances.
- App metrics: ability to restrict access to specified IP whitelist.
+- Configuration: Add `:instance, autofollowing_nicknames` setting to provide a way to make accounts automatically follow new users that register on the local Pleroma instance.
### Changed