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

Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.
2019-03-14 17:14:05 +01:00
parent fa75324059 874bd3ac0c
commit 07eb31eeac
103 changed files with 523 additions and 434 deletions
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@ -2,9 +2,7 @@

 class InstancePresenter
  delegate(
-    :closed_registrations_message,
    :site_contact_email,
-    :open_registrations,
    :site_title,
    :site_short_description,
    :site_description,