Xavier Noria d491130236 Merge branch 'master' of git://github.com/lifo/docrails ...

Conflicts:
	actionpack/lib/action_view/helpers/date_helper.rb
	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt

2011-05-14 11:21:27 +02:00

..

active_model

Merge branch 'master' of git://github.com/lifo/docrails

2011-05-14 11:21:27 +02:00

active_model.rb

We're in 2011, let's update our license

2011-02-22 18:24:20 -02:00