aboutsummaryrefslogtreecommitdiffstats
path: root/railties/builtin/rails_info
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-06-30 19:34:26 -0300
committerEmilio Tagua <miloops@gmail.com>2009-06-30 19:34:26 -0300
commit9c70442534c7754eac3738e0ddf11446b01c4f9e (patch)
tree7af8614ad91e7400735a6be1b36dca704d87e3b6 /railties/builtin/rails_info
parent50f73bd39c729b4ba4b5215b608e5767ab0aa7a1 (diff)
parentb5dfdc714fab7d2836e0a979ca88b4a17db9ec06 (diff)
downloadrails-9c70442534c7754eac3738e0ddf11446b01c4f9e.tar.gz
rails-9c70442534c7754eac3738e0ddf11446b01c4f9e.tar.bz2
rails-9c70442534c7754eac3738e0ddf11446b01c4f9e.zip
Merge commit 'rails/master'
Conflicts: activerecord/test/cases/adapter_test.rb
Diffstat (limited to 'railties/builtin/rails_info')
0 files changed, 0 insertions, 0 deletions