Merge branch 'master' into 3.0

colinhall17 · web-flow · commit 1e6335bf59e5 · 2020-07-08T15:04:11.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -5,5 +5,6 @@ vendor
 coverage
 /dev
 /tests
-/.idea
 .idea
+.idea.*
+/.idea

-Original file line number
+Diff line change
 coverage
 /dev
 /tests
 -/.idea
 .idea
 +.idea.*
 +/.idea