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

Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.
2019-04-08 15:57:56 +02:00
parent 30500dff7c 3f036ac6b8
commit f5f6d23d55
80 changed files with 785 additions and 311 deletions
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@ -13,7 +13,7 @@ class InstancePresenter
  )

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

  def user_count