Merge remote-tracking branch 'origin/release/15.1' into dev

opf · Dec 23, 2024 · ed32281 · ed32281
2 parents c9bccec + 845687b
commit ed32281
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 17 deletions.
diff --git a/app/assets/images/open_desk/favicon.png b/app/assets/images/open_desk/favicon.png
diff --git a/app/assets/images/open_desk/favicon.svg b/app/assets/images/open_desk/favicon.svg
diff --git a/app/seeders/demo_data/open_desk/theme_seeder.rb b/app/seeders/demo_data/open_desk/theme_seeder.rb
@@ -15,7 +15,7 @@ def seed_data! # rubocop:disable Metrics/AbcSize
         custom_style = CustomStyle.current
         custom_style.logo = File.new(OpenProject::OpenDesk::Engine.root.join("app", "assets", "images", "open_desk", "logo.svg"))
         custom_style.favicon = File.new(OpenProject::OpenDesk::Engine.root.join("app", "assets", "images", "open_desk",
-                                                                                "favicon.svg"))
+                                                                                "favicon.png"))
         custom_style.save!
         custom_style.touch
       end