Merge remote main: resolve conflicts, keep local icons and gitignore

2026-05-13 00:31:07 +03:00
parent 8f11c5af43 a1cc10d0a2
commit 1b02227cdd
2 changed files with 8001 additions and 1 deletions
@@ -5,6 +5,5 @@ dist/
 .astro/
 .kimi/
 node_modules_old/
 node_modules/
 package-lock.json
 plan.md