From e4691b69a1590017f7cf0aad5ede711e4870e3a4 Mon Sep 17 00:00:00 2001
From: Jonathan Ong <jonathanrichardong@gmail.com>
Date: Thu, 3 Mar 2016 19:30:21 -0800
Subject: [PATCH] 1.2.0

---
 History.md   | 14 ++++++++++++++
 package.json |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index fc97350..d3fe7ed 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,18 @@
 
+1.2.0 / 2016-03-03
+==================
+
+  * add support for `err.headers` in `ctx.onerror()`
+    - see: https://github.com/koajs/koa/pull/668
+    - note: you should set these headers in your custom error handlers as well
+    - docs: https://github.com/koajs/koa/blob/master/docs/error-handling.md
+  * fix `cookies`' detection of http/https
+    - see: https://github.com/koajs/koa/pull/614
+  * deprecate `app.experimental = true`. Koa v2 does not use this signature.
+  * add a code of conduct
+  * test against the latest version of node
+  * add a lot of docs
+
 1.1.2 / 2015-11-05
 ==================
 
diff --git a/package.json b/package.json
index 438f22a..2703f91 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "koa",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "Koa web app framework",
   "main": "lib/application.js",
   "scripts": {