Merge branch '4.x' into merge-4.x

2021-12-29 23:10:11 +01:00
parent 4da5882660 e2f63da5c0
commit 82c613244a
100 changed files with 425 additions and 280 deletions
@@ -4,7 +4,6 @@
 *.sublime-project
 *.sublime-workspace
 npm-debug.log
-sauce_connect.log*
 .idea
 yarn-error.log
 node_modules
@@ -14,7 +13,7 @@ node_modules
 # Generated files
 /coverage/
 /dist/
-/integration-testing/*/dist/
+/tests/integration/*/dist/

 # Third-party or files that must remain unchanged
 /spec/expected/