aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-03-28 11:34:30 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2010-03-28 11:34:30 -0700
commit154f9ce5fdf5fd4c762a71a87b66363578c145d0 (patch)
tree873f8a012d6948024fd2492f6b95db6cfa042145 /activeresource
parent7e3b4c1f2f0c435f1fa5f8f093ce6934d6a1207d (diff)
parent53bcd4af093854a0826480473533c702a8f80b88 (diff)
downloadrails-154f9ce5fdf5fd4c762a71a87b66363578c145d0.tar.gz
rails-154f9ce5fdf5fd4c762a71a87b66363578c145d0.tar.bz2
rails-154f9ce5fdf5fd4c762a71a87b66363578c145d0.zip
Merge remote branch 'mikel/master'
Diffstat (limited to 'activeresource')
0 files changed, 0 insertions, 0 deletions