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/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@ -10,6 +10,8 @@ class Form::AdminSettings
    :site_contact_email=,
    :site_title,
    :site_title=,
+    :site_short_description,
+    :site_short_description=,
    :site_description,
    :site_description=,
    :site_extended_description,