From 58ef9a449629b0f1ba2f92d4c5e892fc555502bd Mon Sep 17 00:00:00 2001
From: Leopoldthecoder <Leopoldthecuber@gmail.com>
Date: Sun, 19 Mar 2017 10:20:08 +0800
Subject: [PATCH] Changelog: update for 1.2.5

---
 CHANGELOG.en-US.md | 11 +++++++++++
 CHANGELOG.zh-CN.md | 10 ++++++++++
 2 files changed, 21 insertions(+)

diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index 99a0fd80b..594c24618 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -1,5 +1,16 @@
 ## Changelog
 
+### 1.2.5
+
+*2017-03-19*
+
+- Added `show-tooltip` property for Slider, #3430 (by @gabrielboliveira)
+- Fixed Slider precision not updating when `step` is updated, #3475 (by @gabrielboliveira)
+- Fixed a bug that when the window is at the criticality of showing the scrollbar, the popup of Tooltip inside a Table will cause the Table to shake horizontally, #3549
+- Fixed Table automatically shrinking vertically in some conditions, #3539
+- Fixed popup components inside a Popover not hiding when blank area is clicked, #3451 (by @nicoeg)
+- Now Col will hide itself if its `xs`, `sm`, `md` or `lg` is set to 0, #3564
+
 ### 1.2.4
 
 *2017-03-09*
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 0bcb0a9ad..aab88a137 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -1,5 +1,15 @@
 ## 更新日志
 
+### 1.2.5
+*2017-03-19*
+
+- 新增 Slider 的 `show-tooltip` 属性，#3430（by @gabrielboliveira）
+- 修复动态改变 Slider `step` 的精度时，其值的精度不随之改变的问题，#3475（by @gabrielboliveira）
+- 修复含有 Tooltip 的 Table 在当前窗口高度临界于出现滚动条时，弹出 Tooltip 会导致 Table 宽度抖动的问题，#3549
+- 修复 Table 在某些情况下高度自动往复变小的问题，#3539
+- 修复 Popover 中的弹出类组件在点击 Popover 的空白区域时不隐藏的问题，#3451（by @nicoeg）
+- 现在 `xs`、`sm`、`md`、`lg` 值为 0 的 Col 会被正确隐藏，#3564
+
 ### 1.2.4
 *2017-03-09*