Merge remote-tracking branch 'origin/master' into mkt-use-apm-with-npm3-and-node-4

This commit is contained in:
Michelle Tilley
2016-06-28 14:38:14 -07:00
59 changed files with 625 additions and 901 deletions

View File

@@ -16,8 +16,8 @@
"dependencies": {
"async": "0.2.6",
"atom-keymap": "6.3.2",
"atom-ui": "0.3.3",
"babel-core": "^5.8.21",
"bootstrap": "^3.3.4",
"cached-run-in-this-context": "0.4.1",
"chai": "3.5.0",
"clear-cut": "^2.0.1",
@@ -70,10 +70,10 @@
"atom-light-ui": "0.44.0",
"base16-tomorrow-dark-theme": "1.1.0",
"base16-tomorrow-light-theme": "1.1.1",
"one-dark-ui": "1.3.3",
"one-light-ui": "1.3.3",
"one-dark-syntax": "1.2.0",
"one-light-syntax": "1.2.0",
"one-dark-ui": "1.4.0",
"one-light-ui": "1.4.0",
"one-dark-syntax": "1.3.0",
"one-light-syntax": "1.3.0",
"solarized-dark-syntax": "1.0.2",
"solarized-light-syntax": "1.0.2",
"about": "1.5.2",
@@ -85,7 +85,7 @@
"autocomplete-snippets": "1.11.0",
"autoflow": "0.27.0",
"autosave": "0.23.1",
"background-tips": "0.26.0",
"background-tips": "0.26.1",
"bookmarks": "0.41.0",
"bracket-matcher": "0.82.1",
"command-palette": "0.38.0",
@@ -105,10 +105,10 @@
"link": "0.31.1",
"markdown-preview": "0.158.0",
"metrics": "0.53.1",
"notifications": "0.64.1",
"notifications": "0.65.0",
"open-on-github": "1.1.0",
"package-generator": "1.0.0",
"settings-view": "0.238.0",
"settings-view": "0.238.1",
"snippets": "1.0.2",
"spell-check": "0.67.1",
"status-bar": "1.3.1",
@@ -123,31 +123,31 @@
"wrap-guide": "0.38.1",
"language-c": "0.52.1",
"language-clojure": "0.21.0",
"language-coffee-script": "0.47.0",
"language-coffee-script": "0.47.1",
"language-csharp": "0.12.1",
"language-css": "0.36.2",
"language-gfm": "0.87.0",
"language-git": "0.13.0",
"language-css": "0.37.0",
"language-gfm": "0.88.0",
"language-git": "0.14.0",
"language-go": "0.42.0",
"language-html": "0.44.1",
"language-hyperlink": "0.16.0",
"language-java": "0.23.0",
"language-javascript": "0.119.0",
"language-json": "0.18.0",
"language-less": "0.29.3",
"language-json": "0.18.1",
"language-less": "0.29.4",
"language-make": "0.22.2",
"language-mustache": "0.13.0",
"language-objective-c": "0.15.1",
"language-perl": "0.35.0",
"language-php": "0.37.0",
"language-php": "0.37.1",
"language-property-list": "0.8.0",
"language-python": "0.45.0",
"language-ruby": "0.68.5",
"language-ruby": "0.68.6",
"language-ruby-on-rails": "0.25.0",
"language-sass": "0.54.0",
"language-sass": "0.55.0",
"language-shellscript": "0.22.4",
"language-source": "0.9.0",
"language-sql": "0.21.1",
"language-sql": "0.22.0",
"language-text": "0.7.1",
"language-todo": "0.28.0",
"language-toml": "0.18.0",