Merge branch 'master' into 'production'

Master See merge request Romulus21/portal!6
2020-03-29 10:05:38 +00:00
parent a3f905901f 27669f3ae7
commit cbcf10b6c1
1 changed files with 2 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
+
+package-lock.json