summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-05-06 14:47:50 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-05-06 14:47:50 +0300
commit8b97b6f5baa7e0593414fa794ce8059a8e5b95e3 (patch)
treebfdc8369105af33f42f5b56b197623ce72c6fed5 /CHANGELOG.md
parentfb38b7339ccb6c3d7a3a07b74a6471a0f38622fe (diff)
parent07e7c80bc9e919cd92ca9dda1e21384142e5bd77 (diff)
downloadpleroma-8b97b6f5baa7e0593414fa794ce8059a8e5b95e3.tar.gz
pleroma-8b97b6f5baa7e0593414fa794ce8059a8e5b95e3.zip
Merge branch 'develop' into issue/1276-2
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5167b4f5..ec191575f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- **Breaking**: SimplePolicy `:reject` and `:accept` allow deletions again
- Fix follower/blocks import when nicknames starts with @
- Filtering of push notifications on activities from blocked domains
+- Resolving Peertube accounts with Webfinger
## [unreleased-patch]
### Security
@@ -48,6 +49,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Logger configuration through AdminFE
- HTTP Basic Authentication permissions issue
- ObjectAgePolicy didn't filter out old messages
+- Transmogrifier: Keep object sensitive settings for outgoing representation (AP C2S)
### Added
- NodeInfo: ObjectAgePolicy settings to the `federation` list.