Pratik Naik 8260f0b40f Merge remote branch 'mainstream/master' ... Conflicts: railties/guides/source/3_0_release_notes.textile		2010-02-04 13:14:44 +00:00
..
generators	Update Gemfile to use latest bundler config.	2010-02-04 13:53:37 +01:00
rails	Merge remote branch 'mainstream/master'	2010-02-04 13:14:44 +00:00
rails.rb	Add active_model/railtie back to generated boot.rb, add models back to paths, load active_support/railtie since we need it and ensure default logger is set before config.	2010-01-25 01:12:22 +01:00