Merge branch 'master' into glitch-soc/merge-upstream

Conflicts: README.md Discarded upstream changes to the README, kept our version.
2018-09-03 14:33:06 +02:00
parent e915bc3e9e ccc2f608c5
commit 6c233a04a0
67 changed files with 1726 additions and 371 deletions
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -41,6 +41,7 @@ defaults: &defaults
    mention: false
    follow_request: true
    digest: true
+    report: true
  interactions:
    must_be_follower: false
    must_be_following: false