Merge upstream!! #64 <3 <3

2017-07-12 02:03:17 -07:00 · 2017-07-12 02:03:17 -07:00 · 79d898ae0a
commit 79d898ae0a
parent bcf7ee48e9 056b5ed72f
340 changed files with 4980 additions and 2321 deletions
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@ -5,8 +5,10 @@ class InstancePresenter
    :closed_registrations_message,
    :site_contact_email,
    :open_registrations,
+    :site_title,
    :site_description,
    :site_extended_description,
+    :site_terms,
    to: Setting
  )