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

Conflicts: config/settings.yml
2018-08-01 22:20:25 +02:00 · 2018-08-01 22:20:25 +02:00 · bf1d3ae3b8
commit bf1d3ae3b8
parent 71b318dedc 4da03a298a
11 changed files with 16 additions and 6 deletions
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@ -6,6 +6,7 @@ class InstancePresenter
    :site_contact_email,
    :open_registrations,
    :site_title,
+    :site_short_description,
    :site_description,
    :site_extended_description,
    :site_terms,