Merge branch 'master' into release

bbc · Apr 8, 2020 · c76643e · c76643e
2 parents 117505e + 00b8739
commit c76643e
Show file tree

Hide file tree

Showing 2 changed files with 1,129 additions and 2,764 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,17 +24,13 @@
 .env.production.local
 
 npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
 
 
 # Node specific .gitignore
 # Logs
 logs
 *.log
 npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
 
 # Runtime data
 pids
@@ -82,9 +78,6 @@ typings/
 # Output of 'npm pack'
 *.tgz
 
-# Yarn Integrity file
-.yarn-integrity
-
 # dotenv environment variables file
 .env