From 8b2dbf6ba048eef969ebfca360cd7157e472a277 Mon Sep 17 00:00:00 2001
From: dead-horse <dead_horse@qq.com>
Date: Sun, 12 Feb 2017 00:06:13 +0800
Subject: [PATCH] Release 1.2.5

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

diff --git a/History.md b/History.md
index 8e4ec7e..7467222 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,10 @@
 
+1.2.5 / 2017-02-12
+==================
+
+  * Fix malformed content-type header causing exception on charset get (#897)
+  * this.is() returns null when no body is passed (#850)
+
 1.2.4 / 2016-09-07
 ==================
 
diff --git a/package.json b/package.json
index 9c7575f..09d7a04 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "koa",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "Koa web app framework",
   "main": "lib/application.js",
   "scripts": {