Merge branch 'main' into jquery

# Conflicts: # composer.lock
OpenMage · sreichel · Dec 25, 2024 · Dec 25, 2024 · Dec 25, 2024 · Dec 25, 2024
commit d6dcafdcfd19e576848fb913ce10ab7f17d4ce82
diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
         "ezyang/htmlpurifier": "^4.17",
         "magento-hackathon/magento-composer-installer": "^3.1 || ^2.1 || ^4.0",
         "mklkj/tinymce-i18n": "^24.11",
-        "openmage/composer-plugin": "dev-main",
+        "openmage/composer-plugin": "^2.0",
         "pelago/emogrifier": "^7.0",
         "phpseclib/mcrypt_compat": "^2.0.3",
         "phpseclib/phpseclib": "^3.0.14",

diff --git a/composer.lock b/composer.lock