Merge branch 'develop'

project8 · Sep 9, 2019 · 23d3703 · 23d3703
2 parents 753f4f2 + eb4ea9b
commit 23d3703
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -29,6 +29,9 @@ install/*
 .project
 .cproject
 
+# VSCode
+.vscode/
+
 # GEdit
 *~
 /Default/
diff --git a/.gitignore b/.gitignore
@@ -29,6 +29,9 @@ install/*
 .project
 .cproject
 
+# VSCode
+.vscode/
+
 # GEdit
 *~
 /Default/