From b7f1c4077b5075e18cdd0572ecd305cd0564de65 Mon Sep 17 00:00:00 2001
From: RaoHai <surgesoft@gmail.com>
Date: Fri, 27 May 2016 11:09:42 +0800
Subject: [PATCH] update version to 1.2.0 update changelog

---
 CHANGELOG.md | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 413794d7e9..47ae68a3d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ timeline: true
 你也可以查看 GitHub 上的 [发布日志](https://github.com/ant-design/ant-design/releases)。
 
 ---
-## 1.1.1
+## 1.2.0
 
 `2016-05-26`
 
diff --git a/package.json b/package.json
index 43e4e47890..b176f260f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "antd",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "title": "Ant Design",
   "description": "一个 UI 设计语言",
   "homepage": "http://ant.design/",