diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-08-31 16:10:09 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-08-31 16:10:09 -0700 |
| commit | e851e9e407c38e5026835471b7440ab7f2947490 (patch) | |
| tree | 1093183732452a9ef34620d74d9f876a40a08796 /activemodel/lib/active_model/serializers/json.rb | |
| parent | 6ce6ba8638f4995e8e7d57b304fc31d6e27ae0e5 (diff) | |
| parent | f0af56395288d6081d5b36f599fa6bc8695463d6 (diff) | |
| download | rails-e851e9e407c38e5026835471b7440ab7f2947490.tar.gz rails-e851e9e407c38e5026835471b7440ab7f2947490.tar.bz2 rails-e851e9e407c38e5026835471b7440ab7f2947490.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activemodel/lib/active_model/serializers/json.rb')
0 files changed, 0 insertions, 0 deletions