about summary refs log tree commit diff
path: root/config/settings.yml
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-12-09 13:28:09 +0100
committerThibaut Girka <thib@sitedethib.com>2018-12-09 16:08:04 +0100
commite7f1bfdc2d528f137299ba0c3ab2a30f2f91f53c (patch)
tree2693ffce4d340a9b77a7ca52c856aaae7af8c913 /config/settings.yml
parente3682c9c1750e5e7e5d2f817e29f6760a18400ca (diff)
parent81bda7d67c984c9bfcb5bca94e50cec6405b492e (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.
Diffstat (limited to 'config/settings.yml')
-rw-r--r--config/settings.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/settings.yml b/config/settings.yml
index 48639e9a8..bfccd2cc7 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -35,6 +35,7 @@ defaults: &defaults
   noindex: false
   flavour: 'glitch'
   skin: 'default'
+  aggregate_reblogs: true
   notification_emails:
     follow: false
     reblog: false