Merge branch 'master' into ci-terraform-deployments

nhsuk · May 26, 2021 · f0abd6b · f0abd6b
2 parents a379fc3 + 7c6ecc3
commit f0abd6b
Show file tree

Hide file tree

Showing 4 changed files with 2,740 additions and 3,815 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,7 +1,7 @@
 module.exports = {
-    "env": {
-        "browser": true,
-        "es6": true
-    },
-    "extends": "nhsuk",
-}
+  env: {
+    browser: true,
+    es6: true,
+  },
+  extends: 'nhsuk',
+};
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 local.settings.json
 node_modules/
+globalConfig.json
 terraform/.terraform*
-dist/
+dist/