Merge remote-tracking branch 'origin/development' into development

3 years ago · 84eecec98e
parent 71f2ed20b3 aa20633b64
commit 84eecec98e
2 changed files with 4 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@ -21,8 +21,3 @@ VERSION
 # Allow
 !*.dll

-# Frontend
-node_modules
-/frontend/dist
-/frontend/*.local
-/frontend/build
--- a/frontend/.gitignore
+++ b/frontend/.gitignore
@ -0,0 +1,4 @@
+node_modules
+dist
+*.local
+build