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

diff --cc CHANGELOG.md
index 475fc5d89a72d515fcfbf7b6224ae27e9ee507f4,fd5d5f800680c1ac0af16b2627a5bf8b53d735ee..74adae4294a5d04f77b4770e6a40b8095d75f844
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -19,10 -18,9 +19,12 @@@ The format is based on [Keep a Changelo
  - Mastodon API: Added `/api/v1/notifications/:id/dismiss` endpoint.
  </details>
  
- 
+ ### Fixed
+ - Support pagination in conversations API
+ 
 +### Changed
 +- MFR policy to set global expiration for all local Create activities
 +
  ## [2.0.2] - 2020-04-08
  ### Added
  - Support for Funkwhale's `Audio` activity

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