Merge branch 'beta'

Conflicts:
	package.json
This commit is contained in:
Max Brunsfeld
2016-01-13 10:35:47 -08:00

View File

@@ -123,7 +123,7 @@
"language-css": "0.36.0",
"language-gfm": "0.82.0",
"language-git": "0.11.0",
"language-go": "0.41.0",
"language-go": "0.42.0",
"language-html": "0.44.0",
"language-hyperlink": "0.16.0",
"language-java": "0.17.0",