Merge remote-tracking branch 'parent/main' into upstream-20240327

2024-03-27 12:13:55 +09:00 · 2024-03-27 12:13:55 +09:00 · ace193fda3
commit ace193fda3
parent 619802b827 b2d841ce9a
75 changed files with 435 additions and 462 deletions
--- a/app/lib/themes.rb
+++ b/app/lib/themes.rb
@ -11,6 +11,6 @@ class Themes
  end

  def names
-    @conf.keys
+    ['system'] + @conf.keys
  end
 end