From 75279532c9187ff7ad5ae5335894ad9c3480e784 Mon Sep 17 00:00:00 2001
From: Matthew Smith <mtscout6@gmail.com>
Date: Mon, 23 Mar 2015 20:56:15 -0600
Subject: [PATCH] "Release v0.18.0"

---
 CHANGELOG.md | 11 +++++++++++
 package.json |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c52ffde62a..9b1e76cf6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+v0.18.0 - Tue, 24 Mar 2015 02:56:15 GMT
+---------------------------------------
+
+- [728c2b0](../../commit/728c2b0) [fixed] docs CodeMirror scroll height too big
+- [d282621](../../commit/d282621) [fixed] Split buttons with React 0.13
+- [549da6e](../../commit/549da6e) [added] react-router dependency for docs
+- [804c24a](../../commit/804c24a) [added] Support for React 0.13.x
+- [4c26075](../../commit/4c26075) [fixed] Build status badge
+- [70f8596](../../commit/70f8596) [added] Travis CI Optimization
+
+
 v0.17.0 - Tue, 17 Mar 2015 15:03:27 GMT
 ---------------------------------------
 
diff --git a/package.json b/package.json
index c5a88d7945..4077733df9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-bootstrap",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "Bootstrap 3 components build with React",
   "repository": {
     "type": "git",