Merge remote-tracking branch 'refs/remotes/origin/master' into wl-electron-35

This commit is contained in:
Wliu
2015-11-19 20:20:24 -05:00
12 changed files with 93 additions and 26 deletions

View File

@@ -118,7 +118,7 @@
"wrap-guide": "0.38.1",
"language-c": "0.49.0",
"language-clojure": "0.18.0",
"language-coffee-script": "0.43.0",
"language-coffee-script": "0.45.0",
"language-csharp": "0.11.0",
"language-css": "0.35.0",
"language-gfm": "0.81.0",
@@ -127,7 +127,7 @@
"language-html": "0.42.0",
"language-hyperlink": "0.15.0",
"language-java": "0.16.1",
"language-javascript": "0.101.1",
"language-javascript": "0.102.0",
"language-json": "0.17.1",
"language-less": "0.28.3",
"language-make": "0.20.0",
@@ -139,7 +139,7 @@
"language-python": "0.42.1",
"language-ruby": "0.64.0",
"language-ruby-on-rails": "0.24.0",
"language-sass": "0.43.0",
"language-sass": "0.44.0",
"language-shellscript": "0.20.0",
"language-source": "0.9.0",
"language-sql": "0.19.0",