Merge remote-tracking branch 'origin/4.11' into 4.12

yadvr · yadvr · commit 3c431bb8e486 · 2019-06-20T14:32:57.000+05:30
diff --git a/.gitignore b/.gitignore
@@ -99,3 +99,4 @@ scripts/.pydevproject
 *.qcow2
 *.raw
 venv
+.vscode

-Original file line number
+Diff line change
 *.qcow2
 *.raw
 venv
 +.vscode