Xavier Noria 00e1d0832e Merge branch 'master' of git://github.com/lifo/docrails ... Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb		2011-05-25 22:48:47 +02:00
..
rails	Merge branch 'master' of git://github.com/lifo/docrails	2011-05-25 22:48:47 +02:00
rails.rb	Provide a cleaner syntax for paths configuration that does not rely on method_missing.	2010-10-06 17:20:15 +02:00