Update changelog and package.json for beta14

tmcw · tmcw · commit 43e01ce076fc · 2016-11-21T17:52:59.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 4.0.0-beta14
+
+* Highlight all Markdown, not just examples. Fixes #610
+* Fix for `--config` only strip comments on json files (#611)
+* Merge inferred return type like we do for params. Refs #359 (#604)
+* Support webpack's System.import with nice handy babel plugin (#603)
+* Format optional types with ? instead of [] (#538)
+* Fix membership assignment for old-fashioned prototype members (#599)
+* Update Node API documentation to include only exposed API surface
+* Add too-much-inference troubleshooting topic
+
 ## 4.0.0-beta13
 
 * Fix linker null reference error
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "documentation",
   "description": "a documentation generator",
-  "version": "4.0.0-beta13",
+  "version": "4.0.0-beta14",
   "author": "Tom MacWright",
   "bin": {
     "documentation": "./bin/documentation.js"

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "documentation",`
`3`	`3`	`"description": "a documentation generator",`
`4`		`- "version": "4.0.0-beta13",`
	`4`	`+ "version": "4.0.0-beta14",`
`5`	`5`	`"author": "Tom MacWright",`
`6`	`6`	`"bin": {`
`7`	`7`	`"documentation": "./bin/documentation.js"`