Merge branch 'feature/890-add-report-uri' into 'develop'

Feature/890 add report uri Closes #890 See merge request pleroma/pleroma!1164
2019-05-16 20:11:12 +00:00 · 2019-05-16 20:11:12 +00:00 · bf84d50c76
commit bf84d50c76
parent a328251a52 4711d8151c
7 changed files with 126 additions and 84 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Configuration: `fetch_initial_posts` option
 - Configuration: `notify_email` option
 - Configuration: Media proxy `whitelist` option
+- Configuration: `report_uri` option
 - Pleroma API: User subscriptions
 - Pleroma API: Healthcheck endpoint
 - Admin API: Endpoints for listing/revoking invite tokens