diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-31 11:25:54 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-31 11:25:54 -0700 |
commit | d66fd081759af32e57baabf7888823cfd9bcebd0 (patch) | |
tree | 85d312ba731c283be5bccd6343861dbad0023aac /RAILS_VERSION | |
parent | f8f6ad6ebc1602afa6af3c9cb297ea7896fb8b3a (diff) | |
parent | dff6db18840e2fd1dd3f3e4ef0ae7a9a3986d01d (diff) | |
download | rails-d66fd081759af32e57baabf7888823cfd9bcebd0.tar.gz rails-d66fd081759af32e57baabf7888823cfd9bcebd0.tar.bz2 rails-d66fd081759af32e57baabf7888823cfd9bcebd0.zip |
Merge branch '3-2-stable-sec' into 3-2-stable
* 3-2-stable-sec:
Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
bumping to 3.2.4.rc1
Diffstat (limited to 'RAILS_VERSION')
-rw-r--r-- | RAILS_VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/RAILS_VERSION b/RAILS_VERSION index b347b11eac..6f9557bc14 100644 --- a/RAILS_VERSION +++ b/RAILS_VERSION @@ -1 +1 @@ -3.2.3 +3.2.4.rc1 |