diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-06 13:31:07 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-06 13:31:07 -0300 |
| commit | bbec7d72bed585d24f3d0d827b4911e30a887708 (patch) | |
| tree | 65c65beb5cf9e1992a993dd1ee8ac133f825653a /activesupport | |
| parent | a3bda38467377cb8c3cdd52b6fcf6c6c31f74b82 (diff) | |
| parent | 50d6b4549d56ac3a82f2096bd479a7b2305b0bf3 (diff) | |
| download | rails-bbec7d72bed585d24f3d0d827b4911e30a887708.tar.gz rails-bbec7d72bed585d24f3d0d827b4911e30a887708.tar.bz2 rails-bbec7d72bed585d24f3d0d827b4911e30a887708.zip | |
Merge branch '3-2-sec' into 3-2-stable
Conflicts:
actionpack/CHANGELOG.md
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG.md | 15 | ||||
| -rw-r--r-- | activesupport/lib/active_support/version.rb | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 29f7db53eb..e22aded195 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,18 @@ +## Rails 3.2.18 (May 6, 2014) ## + +* No changes. + + +## Rails 3.2.17 (Feb 18, 2014) ## + +* No changes. + + +## Rails 3.2.16 (Dec 3, 2013) ## + +* No changes. + + ## Rails 3.2.15 (Oct 16, 2013) ## * Fix ActiveSupport::Cache::FileStore#cleanup to no longer rely on missing each_key method. diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb index 95faab1dd6..10c9fca86c 100644 --- a/activesupport/lib/active_support/version.rb +++ b/activesupport/lib/active_support/version.rb @@ -2,7 +2,7 @@ module ActiveSupport module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 17 + TINY = 18 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') |