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

Conflicts: config/settings.yml
2018-08-01 22:20:25 +02:00
parent 71b318dedc 4da03a298a
commit bf1d3ae3b8
11 changed files with 16 additions and 6 deletions
--- a/config/settings.yml
+++ b/config/settings.yml
@ -8,6 +8,7 @@
 #
 defaults: &defaults
  site_title: 'dev.glitch.social'
+  site_short_description: ''
  site_description: ''
  site_extended_description: ''
  site_terms: ''