github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-04 19:54:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ns-switch-to-display-layers

Browse Source 
# Conflicts:
#	spec/tokenized-buffer-spec.coffee
This commit is contained in:
Antonio Scandurra
2016-04-20 10:55:56 +02:00
parent 3bbeb9e680 1e147fbaf1
commit 754cbc2a67
12 changed files with 88 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
package.json
View File

@@ -72,7 +72,7 @@
"one-light-syntax": "1.2.0",
"solarized-dark-syntax": "1.0.2",
"solarized-light-syntax": "1.0.2",
"about": "1.5.0",
"about": "1.5.1",
"archive-view": "0.61.1",
"autocomplete-atom-api": "0.10.0",
"autocomplete-css": "0.11.1",
@@ -119,7 +119,7 @@
"wrap-guide": "0.38.1",
"language-c": "0.51.3",
"language-clojure": "0.20.0",
"language-coffee-script": "0.46.1",
"language-coffee-script": "0.47.0",
"language-csharp": "0.12.1",
"language-css": "0.36.1",
"language-gfm": "0.86.0",
@@ -127,7 +127,7 @@
"language-go": "0.42.0",
"language-html": "0.44.1",
"language-hyperlink": "0.16.0",
"language-java": "0.17.0",
"language-java": "0.18.0",
"language-javascript": "0.110.0",
"language-json": "0.18.0",
"language-less": "0.29.3",
@@ -140,7 +140,7 @@
"language-python": "0.43.1",
"language-ruby": "0.68.5",
"language-ruby-on-rails": "0.25.0",
"language-sass": "0.46.0",
"language-sass": "0.47.0",
"language-shellscript": "0.21.1",
"language-source": "0.9.0",
"language-sql": "0.21.0",
@@ -148,7 +148,7 @@
"language-todo": "0.27.0",
"language-toml": "0.18.0",
"language-xml": "0.34.5",
"language-yaml": "0.25.2"
"language-yaml": "0.26.0"
},
"private": true,
"scripts": {