From b8e86150542bd0c879abf92cdb2526505b5b42d5 Mon Sep 17 00:00:00 2001
From: Jimmy Jia <tesrin@gmail.com>
Date: Tue, 25 Aug 2015 14:56:33 -0400
Subject: [PATCH] Release v0.25.0

---
 CHANGELOG-alpha.md | 16 ----------------
 CHANGELOG.md       | 21 +++++++++++++++++++++
 package.json       |  2 +-
 3 files changed, 22 insertions(+), 17 deletions(-)
 delete mode 100644 CHANGELOG-alpha.md

diff --git a/CHANGELOG-alpha.md b/CHANGELOG-alpha.md
deleted file mode 100644
index f59c83c0a9..0000000000
--- a/CHANGELOG-alpha.md
+++ /dev/null
@@ -1,16 +0,0 @@
-v0.25.0-alpha.1 - Mon, 10 Aug 2015 19:41:20 GMT
------------------------------------------------
-
-- [b688014](../../commit/b688014) [added] custom feedback icons for Input
-- [83cdaa3](../../commit/83cdaa3) [added] formControlFeedback prop to Glyphicon
-- [2ecac68](../../commit/2ecac68) [fixed] Modal uses provided className again
-- [47bd7f6](../../commit/47bd7f6) [fixed] disabled pagination buttons should not fire 'onSelect'
-- [c60dc03](../../commit/c60dc03) [fixed] only add aria-expanded to Collapse when an ARIA role is present
-
-
-
-v0.25.0-alpha.0 - Fri, 31 Jul 2015 19:37:39 GMT
------------------------------------------------
-
-- [f6d32c4](../../commit/f6d32c4) [changed] deprecate 'utils/CustomPropTypes' exporting
-- [caff9a0](../../commit/caff9a0) [removed] Factory support
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfee022362..fca08f6209 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,24 @@
+v0.25.0 - Tue, 25 Aug 2015 18:56:33 GMT
+---------------------------------------
+
+- [8776128](../../commit/8776128) [fixed] Affix in IE10 - scrollHeight #1073
+- [adad32e](../../commit/adad32e) [added] PropType validation for headerRole and panelRole
+- [346501e](../../commit/346501e) [changed] DropdownButton, SplitButton, DropdownMenu, MenuItem completely rewritten
+- [653d2ff](../../commit/653d2ff) [changed] deprecate domUtils as a public API
+- [769781d](../../commit/769781d) [added] accessibility props for PanelGroup and Panels.
+- [5f0ac64](../../commit/5f0ac64) [added] Implements a generalized left-aligned version of tabs
+- [628d586](../../commit/628d586) [changed] deprecated Position, Transition, Portal
+- [03a6a61](../../commit/03a6a61) [changed] deprecated the Transition duration prop
+- [459ab0c](../../commit/459ab0c) [added] #460 ListGroupItem outputs <button> when an onClick handler is set.
+- [e482ede](../../commit/e482ede) [fixed] wrong tabs switching animation for 'Tabs' component
+- [b62e1f5](../../commit/b62e1f5) [fixed] wrong tabs switching animation for 'TabbedArea' component
+- [d0ff625](../../commit/d0ff625) [added] aria role "tablist" to the Nav on Tabs
+- [e7cf455](../../commit/e7cf455) [changed] New Tabs API
+- [f6d32c4](../../commit/f6d32c4) [changed] deprecate 'utils/CustomPropTypes' exporting
+- [caff9a0](../../commit/caff9a0) [removed] Factory support
+
+
+
 v0.24.5 - Fri, 14 Aug 2015 18:02:13 GMT
 ---------------------------------------
 
diff --git a/package.json b/package.json
index bb4364a9c9..1b55af8107 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-bootstrap",
-  "version": "0.24.5",
+  "version": "0.25.0",
   "description": "Bootstrap 3 components build with React",
   "repository": {
     "type": "git",