Merge remote-tracking branch 'origin/develop' into global-status-expiration

diff --cc CHANGELOG.md
index ec6b0cb3828d59ace770513724b4db7ea6dc4154,100228c6c8c3d7574cc44c23f00ce32f20e8bd46..31156312ced8cdf21c2231b8abe31adb61397c73
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -3,7 -3,7 +3,14 @@@ All notable changes to this project wil
  
  The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
  
 +## [Unreleased]
++
++### Changed
++
++- 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 lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/mrf.ex
Simple merge

diff --cc lib/pleroma/web/common_api/activity_draft.ex
Simple merge

diff --cc lib/pleroma/web/common_api/common_api.ex
Simple merge