diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-05-15 21:54:46 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-05-15 21:54:46 +0100 |
| commit | 879493c35fd8d9e12e5cf3e56cd67ff07c3345c5 (patch) | |
| tree | 9615859e1d9a52f71da444b0b7359817bb6acc50 /activerecord/CHANGELOG | |
| parent | d6ecce66f4e125531875006eea8022b73fe135b5 (diff) | |
| parent | fc02eabf296d6edb74a95174c7322293a54c9492 (diff) | |
| download | rails-879493c35fd8d9e12e5cf3e56cd67ff07c3345c5.tar.gz rails-879493c35fd8d9e12e5cf3e56cd67ff07c3345c5.tar.bz2 rails-879493c35fd8d9e12e5cf3e56cd67ff07c3345c5.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionmailer/lib/action_mailer/base.rb
Diffstat (limited to 'activerecord/CHANGELOG')
| -rw-r--r-- | activerecord/CHANGELOG | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 4a130bf5c0..cd526a52a7 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,4 +1,4 @@ -*SVN* +*2.1.0 RC1 (May 11th, 2008)* * Ensure hm:t preloading honours reflection options. Resolves #137. [Frederick Cheung] |