diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-06-16 17:14:16 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-06-16 17:14:16 -0300 |
| commit | 2077091230b63b6d06fd572ddcea809cae5e7ef6 (patch) | |
| tree | 0331b4a43eeae85411caa102b417e7436720ec5c /activemodel | |
| parent | b344986bc3d94ca7821fc5e0eef1874882ac6cbb (diff) | |
| parent | 9dc8ddc39424818a3d713a353353ac20cb431218 (diff) | |
| download | rails-2077091230b63b6d06fd572ddcea809cae5e7ef6.tar.gz rails-2077091230b63b6d06fd572ddcea809cae5e7ef6.tar.bz2 rails-2077091230b63b6d06fd572ddcea809cae5e7ef6.zip | |
Merge branch '3-2-sec' into 3-2-stable
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | activemodel/lib/active_model/version.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index 4f2e4e1959..50a4852f63 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 3.2.22 (Jun 16, 2015) ## + +* No changes. + + ## Rails 3.2.19 (Jul 2, 2014) ## * No changes. diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb index 73ef6f9c6d..a44ecbdb41 100644 --- a/activemodel/lib/active_model/version.rb +++ b/activemodel/lib/active_model/version.rb @@ -2,7 +2,7 @@ module ActiveModel module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 21 + TINY = 22 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') |