Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists

diff --cc CHANGELOG.md
index 3403ce64e2a12fc2445835190ada7010d191bae8,7fc8db31cbc6f9d8978bb262f2c85f171a60243c..86c90da0b609f53faf99a1bd5100afe46b0952cb
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -25,11 -33,20 +33,21 @@@ The format is based on [Keep a Changelo
  - Admin API: Return users' tags when querying reports
  - Admin API: Return avatar and display name when querying users
  - Admin API: Allow querying user by ID
+ - Admin API: Added support for `tuples`.
  - Added synchronization of following/followers counters for external users
  - Configuration: `enabled` option for `Pleroma.Emails.Mailer`, defaulting to `false`.
- - Mastodon API: Add support for categories for custom emojis by reusing the group feature. <https://github.com/tootsuite/mastodon/pull/11196>
+ - Configuration: Pleroma.Plugs.RateLimiter `bucket_name`, `params` options.
 +- Addressable lists
  
+ ### Changed
+ - Configuration: Filter.AnonymizeFilename added ability to retain file extension with custom text
+ - Admin API: changed json structure for saving config settings.
+ - RichMedia: parsers and their order are configured in `rich_media` config.
+ 
+ ## [1.0.1] - 2019-07-14
+ ### Security
+ - OStatus: fix an object spoofing vulnerability.
+ 
  ## [1.0.0] - 2019-06-29
  ### Security
  - Mastodon API: Fix display names not being sanitized

diff --cc docs/api/differences_in_mastoapi_responses.md
Simple merge

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

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

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

diff --cc test/web/activity_pub/transmogrifier_test.exs
Simple merge

diff --cc test/web/common_api/common_api_test.exs
Simple merge