diff options
| author | rick <technoweenie@gmail.com> | 2008-05-31 17:15:24 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-05-31 17:15:24 -0700 |
| commit | 6a975d6ca28216cfa015374c802279349e9253ca (patch) | |
| tree | e0a73c68e00755993f2bac86115f178656637c93 /railties/CHANGELOG | |
| parent | 72483c0d4c1e4ea794919974100acc2f255f6fd2 (diff) | |
| parent | ea03b0885c110003496c1f99dc7d9d2f1534955b (diff) | |
| download | rails-6a975d6ca28216cfa015374c802279349e9253ca.tar.gz rails-6a975d6ca28216cfa015374c802279349e9253ca.tar.bz2 rails-6a975d6ca28216cfa015374c802279349e9253ca.zip | |
fix changelog conflict
Diffstat (limited to 'railties/CHANGELOG')
| -rw-r--r-- | railties/CHANGELOG | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 7f1c6ad747..fe517755ef 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,10 +1,4 @@ -*SVN* - -* Consolidate error messages for missing gems, and skip them when running rake gems:* tasks. [rick] - -* Use a system command to install gems, since GemRunner exits the ruby process. #210 [Tim Morgan] - -*2.1.0 RC1 (May 11th, 2008)* +*2.1.0 (May 31st, 2008)* * script/dbconsole fires up the command-line database client. #102 [Steve Purcell] |