Merge remote-tracking branch 'parent/main' into kb-upstream-20231026

2023-10-26 20:24:34 +09:00 · 2023-10-26 20:24:34 +09:00 · 5448bcf276
commit 5448bcf276
parent 551a9e8216 49b8433c56
313 changed files with 3717 additions and 4735 deletions
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@ -1,7 +1,7 @@
 !!!
 %html{ lang: I18n.locale }
  %head
-    %meta{ content: 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type' }/
+    %meta{ 'content' => 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type' }/
    %meta{ charset: 'utf-8' }/
    %title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ')
    %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/