Merge branch 'develop' into global-status-expiration

diff --cc CHANGELOG.md
index 31156312ced8cdf21c2231b8abe31adb61397c73,4168086e269bb4fee745ee0e26c0bc56eb638cba..77cd35990b5bbd4cb6fc3a4fc139e4323ee682b0
--- 1/CHANGELOG.md
--- 2/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.

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge

diff --cc docs/configuration/cheatsheet.md
Simple merge