diff --git a/CHANGELOG.md b/CHANGELOG.md index 6449e0a4a..21bd01b54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,18 @@ #### Bug Fixes +## 1.4.0 (October 22, 2015) + +#### Breaking Changes + +#### New Features + +- Include React.js 0.14 + +#### Deprecation + +#### Bug Fixes + ## 1.3.3 (October 21, 2015) #### Breaking Changes diff --git a/README.md b/README.md index c319373f2..8ba38f2e0 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ in your Ruby on Rails (3.2+) application. `react-rails` can: Add `react-rails` to your gemfile: ```ruby -gem 'react-rails', '~> 1.3.0' +gem 'react-rails', '~> 1.4.0' ``` Next, run the installation script: diff --git a/VERSIONS.md b/VERSIONS.md index f7a899aee..69bb3c32b 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -9,7 +9,8 @@ You can control what version of React.js (and JSXTransformer) is used by `react- | Gem | React.js | |----------|----------| -| master | 0.13.3 | +| master | 0.14.0 | +| 1.4.0 | 0.14.0 | | 1.3.3 | 0.13.3 | | 1.3.2 | 0.13.3 | | 1.3.1 | 0.13.3 | diff --git a/lib/react/rails/version.rb b/lib/react/rails/version.rb index 48f55cfc6..16a0ea911 100644 --- a/lib/react/rails/version.rb +++ b/lib/react/rails/version.rb @@ -1,6 +1,6 @@ module React module Rails # If you change this, make sure to update VERSIONS.md - VERSION = '1.3.3' + VERSION = '1.4.0' end end