From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Mon, 16 Mar 2020 11:31:31 +0000 (+0400)
Subject: Merge branch 'develop' into global-status-expiration
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=421e35b578b3fc109f820f693e91139a3e3f8970;p=akkoma

Merge branch 'develop' into global-status-expiration
---

421e35b578b3fc109f820f693e91139a3e3f8970
diff --cc CHANGELOG.md
index 31156312c,4168086e2..77cd35990
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -3,13 -3,10 +3,11 @@@ All notable changes to this project wil
  
  The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
  
- ## [Unreleased]
- 
+ ## [unreleased]
  ### Changed
- 
+ - **Breaking:** BBCode and Markdown formatters will no longer return any `\n` and only use `<br/>` for newlines
 +- MFR policy to set global expiration for all local Create activities
  
- 
  ## [2.0.0] - 2019-03-08
  ### Security
  - Mastodon API: Fix being able to request enourmous amount of statuses in timelines leading to DoS. Now limited to 40 per request.