Merge branch 'master' of github.com:ant-design/ant-design

CHANGELOG.en-US.md

@@ -9,6 +9,12 @@ If you want to read change logs before `2.0.0`, please visit [GitHub](https://gi
 
 ---
 
+## 2.3.2
+
+`2016-11-09`
+
+* Fix dead loop while using `getFieldProps`.
+
 ## 2.3.1
 
 `2016-11-07`

CHANGELOG.zh-CN.md

@@ -9,6 +9,12 @@ timeline: true
 
 ---
 
+## 2.3.2
+
+`2016-11-09`
+
+* 修复使用 `getFieldProps` 会导致死循环的问题。
+
 ## 2.3.1
 
 `2016-11-07`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "title": "Ant Design",
   "description": "An enterprise-class UI design language and React-based implementation",
   "homepage": "http://ant.design/",