diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-05-09 11:46:45 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-05-09 11:46:45 +0200 |
| commit | e1a0d86fe0355ddff8c86db0f42f3824ffe14c02 (patch) | |
| tree | 5833022ca41905f243c15c8a5ffdf864de69bfa6 /activemodel/CHANGELOG | |
| parent | 1ff3d951e620ddeeb97e87e2024391470e886467 (diff) | |
| parent | df508bd97062b871fe25eda8d1bb61cd43d79bc4 (diff) | |
| download | rails-e1a0d86fe0355ddff8c86db0f42f3824ffe14c02.tar.gz rails-e1a0d86fe0355ddff8c86db0f42f3824ffe14c02.tar.bz2 rails-e1a0d86fe0355ddff8c86db0f42f3824ffe14c02.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'activemodel/CHANGELOG')
| -rw-r--r-- | activemodel/CHANGELOG | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activemodel/CHANGELOG b/activemodel/CHANGELOG index 74aec3bfd3..43cf67d2b7 100644 --- a/activemodel/CHANGELOG +++ b/activemodel/CHANGELOG @@ -1,3 +1,8 @@ +*Rails 3.0.0 [beta 4/release candidate] (unreleased)* + +* JSON supports a custom root option: to_json(:root => 'custom') #4515 [Jatinder Singh] + + *Rails 3.0.0 [beta 3] (April 13th, 2010)* * No changes |