Merge branch 'master' of https://github.com/Microsoft/vscode-dev-containers

Chuxel · Chuxel · commit efbd7bf265df · 2019-09-06T10:00:33.000-07:00
diff --git a/.gitattributes b/.gitattributes
@@ -5,4 +5,4 @@
 *.jpeg binary
 *.png binary
 *.gz binary
-*.jar biary
+*.jar binary
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vscode-dev-containers",
-	"version": "0.29.0",
+	"version": "0.30.0",
 	"description": "VS Code Dev Containers: Definitions and Templates",
 	"repository": {
 		"type": "git",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vscode-dev-containers",`
`3`		`- "version": "0.29.0",`
	`3`	`+ "version": "0.30.0",`
`4`	`4`	`"description": "VS Code Dev Containers: Definitions and Templates",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`