Merge tag 'v1.0.5+3.2.0' into hometown-v1.0.5+3.3.0

2021-04-22 16:37:11 -07:00
parent b43c50afa8 799bf57e68
commit 4fe7cfc4be
126 changed files with 2708 additions and 366 deletions
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@ -12,6 +12,8 @@
  %body.error
    .dialog
      .dialog__illustration
-        %img{ alt: Setting.default_settings['site_title'], src: '/oops.png' }/
+        %h1
+          = link_to root_url, class: 'brand' do
+            = Setting.default_settings['site_title']
      .dialog__message
        %h1= yield :content