diff options
author | Xavier Noria <fxn@hashref.com> | 2010-09-23 22:35:08 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2010-09-23 22:35:08 +0200 |
commit | 8c0c815ba711c439cbc4d295c423d5d6ab0bb848 (patch) | |
tree | 46ebc98a50a631a8962cb48505f75454cd8f24f1 /activemodel/lib/active_model/serialization.rb | |
parent | afdf86e8ee7c64915515e7ad8930efd858fceb43 (diff) | |
parent | 5965219ca2230dc46cff2feace19d83b7493f440 (diff) | |
download | rails-8c0c815ba711c439cbc4d295c423d5d6ab0bb848.tar.gz rails-8c0c815ba711c439cbc4d295c423d5d6ab0bb848.tar.bz2 rails-8c0c815ba711c439cbc4d295c423d5d6ab0bb848.zip |
resolves rdoc conflict
Diffstat (limited to 'activemodel/lib/active_model/serialization.rb')
0 files changed, 0 insertions, 0 deletions