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/settings/two_factor_authentication_methods/index.html.haml
+++ b/app/views/settings/two_factor_authentication_methods/index.html.haml
@ -7,7 +7,7 @@
 %p.hint
  %span.positive-hint
    = fa_icon 'check'
-    = ' '
+    &nbsp;
    = t 'two_factor_authentication.enabled'

 .table-wrapper