aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2011-04-19 09:42:11 -0500
committerJoshua Peek <josh@joshpeek.com>2011-04-19 09:42:11 -0500
commit011afb70e51c063de7685196bcace55ddf0dc67b (patch)
tree18e802e29d90edc0efe0e8178e0e6b8f7df34631 /activerecord
parent069e9b004f91c4ace1373ab5203bb00ab41bd1f9 (diff)
parentb24621809ebd4c69796b5ca6b41e7720bc52228a (diff)
downloadrails-011afb70e51c063de7685196bcace55ddf0dc67b.tar.gz
rails-011afb70e51c063de7685196bcace55ddf0dc67b.tar.bz2
rails-011afb70e51c063de7685196bcace55ddf0dc67b.zip
Merge branch 'multi_json' of https://github.com/joshk/rails into joshk-multi_json
Diffstat (limited to 'activerecord')
0 files changed, 0 insertions, 0 deletions