Merge branch 'master' into cz-update-native-modules

Conflicts:
	package.json
This commit is contained in:
Max Brunsfeld
2015-09-23 12:46:08 -07:00

View File

@@ -66,10 +66,10 @@
"atom-light-ui": "0.43.0",
"base16-tomorrow-dark-theme": "0.27.0",
"base16-tomorrow-light-theme": "0.9.0",
"one-dark-ui": "1.1.3",
"one-dark-ui": "1.1.4",
"one-dark-syntax": "1.1.0",
"one-light-syntax": "1.1.0",
"one-light-ui": "1.1.3",
"one-light-ui": "1.1.4",
"solarized-dark-syntax": "0.38.1",
"solarized-light-syntax": "0.22.1",
"about": "1.1.0",
@@ -99,7 +99,7 @@
"keybinding-resolver": "0.33.0",
"line-ending-selector": "0.0.5",
"link": "0.31.0",
"markdown-preview": "0.153.0",
"markdown-preview": "0.154.0",
"metrics": "0.51.0",
"notifications": "0.59.0",
"open-on-github": "0.38.0",