Merge pull request #1 from gchq/master

bring up to date with master
gchq · Mar 12, 2019 · 0a7a0ac · 0a7a0ac
2 parents 8148c1a + 981d4be
commit 0a7a0ac
Show file tree

Hide file tree

Showing 48 changed files with 4,251 additions and 748 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -102,6 +102,7 @@
         "$": false,
         "jQuery": false,
         "log": false,
+        "app": false,
 
         "COMPILE_TIME": false,
         "COMPILE_MSG": false,