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

2019-08-06 13:16:53 +02:00
parent 3ea7a334d8 1d8d553d8b
commit cad2e6eb7a
39 changed files with 384 additions and 296 deletions
--- a/config/settings.yml
+++ b/config/settings.yml
@ -47,6 +47,7 @@ defaults: &defaults
    digest: true
    report: true
    pending_account: true
+    trending_tag: true
  interactions:
    must_be_follower: false
    must_be_following: false