diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-08 16:47:00 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-12 21:06:50 -0300 |
| commit | facfc24f256d8367f33a62e3bbea6c0f8c698c1f (patch) | |
| tree | 36c41ad6b934ce1cacf907fac029b4a545fe768e /actionpack | |
| parent | 714cb5a436e72d00ca0e5e6efa4b789c3e6f5b04 (diff) | |
| download | rails-facfc24f256d8367f33a62e3bbea6c0f8c698c1f.tar.gz rails-facfc24f256d8367f33a62e3bbea6c0f8c698c1f.tar.bz2 rails-facfc24f256d8367f33a62e3bbea6c0f8c698c1f.zip | |
Preparing for 3.2.14.rc1 release
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_pack/version.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index ac260a9592..bf697a3800 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,4 +1,4 @@ -## unreleased ## +## Rails 3.2.14.rc1 (Jul 8, 2013) ## * Merge `:action` from routing scope and assign endpoint if both `:controller` and `:action` are present. The endpoint assignment only occurs if there is diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb index f319266765..4189730e75 100644 --- a/actionpack/lib/action_pack/version.rb +++ b/actionpack/lib/action_pack/version.rb @@ -2,8 +2,8 @@ module ActionPack module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 13 - PRE = nil + TINY = 14 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end |