rails/railties/lib
Pratik Naik e68bfaf1fe Merge remote branch 'mainstream/master'
Conflicts:
	activerecord/lib/active_record/base.rb
	railties/lib/rails/configuration.rb
	railties/lib/rails/log_subscriber.rb
2010-03-12 16:00:01 +00:00
..
generators Merge remote branch 'mainstream/master' 2010-03-12 16:00:01 +00:00
rails Merge remote branch 'mainstream/master' 2010-03-12 16:00:01 +00:00
rails.rb Rename Rails::Subscriber to Rails::LogSubscriber 2010-02-16 22:36:15 +01:00