Version bump, changelog update

kornelski · kornelski · commit 6e45e5828da4 · 2015-12-09T15:07:04.000Z
diff --git a/History.md b/History.md
@@ -1,3 +1,14 @@
+# 1.6.0 (2015-12-09)
+
+ * avoid misleading CORS error message
+ * added 'progress' event on file/form upload in Node (Olivier Lalonde)
+ * return raw response if the response parsing fails (Rei Colina)
+ * parse content-types ending with `+json` as JSON (Eiryyy)
+ * fix to avoid throwing errors on aborted requests (gjurgens)
+ * retain cookies on redirect when hosts match (Tom Conroy)
+ * added Bower manifest (Johnny Freeman)
+ * upgrade to latest cookiejar (Andy Burke)
+
 # 1.5.0 (2015-11-30)
 
  * encode array values as `key=1&key=2&key=3` etc... (aalpern, Davis Kim)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "superagent",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "elegant & feature rich browser / node HTTP with a fluent API",
   "scripts": {
     "test": "make test"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "superagent",`
`3`		`- "version": "1.5.0",`
	`3`	`+ "version": "1.6.0",`
`4`	`4`	`"description": "elegant & feature rich browser / node HTTP with a fluent API",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"test": "make test"`