Merge remote-tracking branch 'origin/master-2.8'

mantisbt · Dec 2, 2017 · 7a70e3c · 7a70e3c
2 parents dc4031f + 3a137cb
commit 7a70e3c
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,6 +28,7 @@ plugins/*
 .project
 .settings
 .idea/
+.vscode/
 *.kdev4
 nbproject/