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

# Conflicts:
#	package.json
This commit is contained in:
Wliu
2015-11-27 11:10:14 -05:00
2 changed files with 5 additions and 4 deletions

View File

@@ -255,6 +255,7 @@ Both issue lists are sorted by total number of comments. While not perfect, numb
* Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
* Limit the first line to 72 characters or less
* Reference issues and pull requests liberally
* When only changing documentation, include `[ci skip]` in the commit description
* Consider starting the commit message with an applicable emoji:
* :art: `:art:` when improving the format/structure of the code
* :racehorse: `:racehorse:` when improving performance

View File

@@ -103,7 +103,7 @@
"open-on-github": "0.40.0",
"package-generator": "0.41.0",
"release-notes": "0.53.0",
"settings-view": "0.232.0",
"settings-view": "0.232.1",
"snippets": "1.0.1",
"spell-check": "0.63.0",
"status-bar": "0.80.0",
@@ -116,7 +116,7 @@
"welcome": "0.33.0",
"whitespace": "0.32.1",
"wrap-guide": "0.38.1",
"language-c": "0.50.0",
"language-c": "0.50.1",
"language-clojure": "0.18.0",
"language-coffee-script": "0.45.0",
"language-csharp": "0.11.0",
@@ -127,9 +127,9 @@
"language-html": "0.42.0",
"language-hyperlink": "0.15.0",
"language-java": "0.17.0",
"language-javascript": "0.102.1",
"language-javascript": "0.102.2",
"language-json": "0.17.1",
"language-less": "0.28.3",
"language-less": "0.29.0",
"language-make": "0.20.0",
"language-mustache": "0.13.0",
"language-objective-c": "0.15.0",