Merge pull request #99 from apiaryio/kylef/release-1.1.0

danielgtaylor · danielgtaylor · commit 042a60b6594f · 2015-10-22T20:10:33.000-07:00
Release 1.1.0
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ The best way to install Protagonist is by using its [NPM package](https://npmjs.
 $ npm install protagonist
 ```
 
-Works smoothly with node.js ~0.8.15, 0.10.x, 0.12.x and iojs v1.x.x
+Works smoothly with node.js ~0.8.15, 0.10.x, 0.12.x, 2 to 4 and iojs v1.x.x
 
 ## Getting started
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "protagonist",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "API Blueprint Parser",
   "author": "Apiary.io <support@apiary.io>",
   "main": "./build/Release/protagonist",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "protagonist",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.1.0",`
`4`	`4`	`"description": "API Blueprint Parser",`
`5`	`5`	`"author": "Apiary.io <support@apiary.io>",`
`6`	`6`	`"main": "./build/Release/protagonist",`