Merge remote-tracking branch 'origin/master' into alex/keybinding

This commit is contained in:
Alex Dima
2017-03-22 17:26:37 +01:00
225 changed files with 5291 additions and 4645 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
"name": "code-oss-dev",
"version": "1.11.0",
"electronVersion": "1.4.6",
"distro": "64f6f295b56a3512bf34dfb643f770160fd33ee8",
"distro": "612d0710388e5aad15b430be26f86d86ddfd1abd",
"author": {
"name": "Microsoft Corporation"
},