Merge remote-tracking branch 'origin/master' into ns-switch-to-display-layers

This commit is contained in:
Nathan Sobo
2016-04-21 10:43:55 -06:00
4 changed files with 8 additions and 3 deletions

View File

@@ -131,7 +131,7 @@
"language-javascript": "0.110.0",
"language-json": "0.18.0",
"language-less": "0.29.3",
"language-make": "0.21.1",
"language-make": "0.22.0",
"language-mustache": "0.13.0",
"language-objective-c": "0.15.1",
"language-perl": "0.34.0",