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

Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.
2018-08-24 13:34:51 +02:00
parent 0ddf439999 a2cabf3f4a
commit 246c313d45
52 changed files with 534 additions and 282 deletions
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@ -14,7 +14,7 @@ class InstancePresenter
  )

  def contact_account
-    Account.find_local(Setting.site_contact_username)
+    Account.find_local(Setting.site_contact_username.gsub(/\A@/, ''))
  end

  def user_count