diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-05-14 11:21:27 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-05-14 11:21:27 +0200 |
| commit | d49113023676fbf0b6653730f5bde759990caede (patch) | |
| tree | de8a47655ad3a1fa1e73dbc307ec9b806637b3ec /activemodel/MIT-LICENSE | |
| parent | db886c817c3620ceaa68a988947e49e5219532fd (diff) | |
| parent | e5524d538c0d0f39d655a78fc45d2122c0ff2f2a (diff) | |
| download | rails-d49113023676fbf0b6653730f5bde759990caede.tar.gz rails-d49113023676fbf0b6653730f5bde759990caede.tar.bz2 rails-d49113023676fbf0b6653730f5bde759990caede.zip | |
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
Diffstat (limited to 'activemodel/MIT-LICENSE')
0 files changed, 0 insertions, 0 deletions