Merge branch 'develop' into global-status-expiration

diff --cc CHANGELOG.md
index 74adae4294a5d04f77b4770e6a40b8095d75f844,36897503ac1fa3fbfb3a0601c2353defb0a7a443..a0173351f5a51497af198e7500f43458600f9956
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -22,9 -21,8 +21,11 @@@ The format is based on [Keep a Changelo
  ### Fixed
  - Support pagination in conversations API
  
 +### Changed
 +- MFR policy to set global expiration for all local Create activities
 +
+ ## [unreleased-patch]
+ 
  ## [2.0.2] - 2020-04-08
  ### Added
  - Support for Funkwhale's `Audio` activity

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