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

Author: markusguenther

Diff for: .gitignore

@@ -20,3 +20,7 @@
 Build/Resources/Java/selenium-server-standalone*
 /"
 Upgrading.rst
+
+# ignore dummy packages from neos-ui test distribution
+/DummyDistributionPackages
+/.editorconfig

Diff for: composer.json

@@ -21,12 +21,12 @@
     "neos/neos-ui-compiled": "@dev",
     "neos/fusion-afx": "@dev",
     "neos/fusion-form": "@dev",
-    "neos/party": "@dev",
+    "neos/party": "dev-master",
     "neos/seo": "@dev",
     "neos/imagine": "@dev",
     "neos/twitter-bootstrap": "@dev",
     "neos/form": "@dev",
-    "neos/setup": "@dev",
+    "neos/setup": "dev-master",
     "flowpack/neos-frontendlogin": "^4.1",
     "neos/buildessentials": "@dev",
     "mikey179/vfsstream": "^1.6",