This project is archived and is in readonly mode.
Changeset [9e914f81a8c9f36b007e04f0643b93ea17faecd6] by Joshua Peek
Revision 9e914f81a8c9f36b007e04f0643b93ea17faecd6,
committed by Joshua Peek
· December 1st, 2008 @ 06:23 PM
Merge branch 'master' into metal
Conflicts:
railties/lib/commands/server.rb
5 changed files
-
M
railties/config.ru -
M
railties/dispatches/config.ru -
M
railties/lib/rails_generator/generators/applications/app/app_generator.rb -
M
railties/lib/tasks/framework.rake -
M
railties/test/initializer_test.rb