Merge branch 'chore/changelog-update' into 'develop'

Add a changelog entry for disallowing locked accounts follows over OStatus See merge request pleroma/pleroma!1513
2019-07-31 20:08:27 +00:00 · 2019-07-31 20:08:27 +00:00 · cdfd02e904
parent 6c06529cd4 def0c49ead
commit cdfd02e904
1 changed files with 1 additions and 0 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 ### Security
 - OStatus: eliminate the possibility of a protocol downgrade attack.
+- OStatus: prevent following locked accounts, bypassing the approval process.

 ### Changed
 - **Breaking:** Configuration: A setting to explicitly disable the mailer was added, defaulting to true, if you are using a mailer add `config :pleroma, Pleroma.Emails.Mailer, enabled: true` to your config