Merge remote-tracking branch 'origin/main' into wilm

# Conflicts: # shopdb/data/catalog.json
2026-08-26 12:53:03 -04:00
parent 7cd3aadcd1 271d558f8b
commit 801dfd54ab
21 changed files with 1675 additions and 20 deletions
--- a/shopdb/data/catalog.json
+++ b/shopdb/data/catalog.json
@@ -659,7 +659,7 @@
      "vendor": "Toshulin"
    },
    {
-      "vendor": "VMware"
+      "vendor": "VM-Ware"
    },
    {
      "vendor": "WJDT"
@@ -1428,7 +1428,7 @@
    },
    {
      "modelnumber": "Virtual Server",
-      "vendor": "VMware",
+      "vendor": "VM-Ware",
      "modeltype": "Server"
    },
    {