aboutsummaryrefslogtreecommitdiffstats
path: root/Rakefile
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2008-05-25 11:16:46 +0100
committerPratik Naik <pratiknaik@gmail.com>2008-05-25 11:16:46 +0100
commitdc6da2e3701f370ce7fa997c4d4dea22998f7150 (patch)
tree805759f9f2f942a3c80b80cb8cf996a6494c8b54 /Rakefile
parent11ea3e947a1b5a59a5f77ba392a32f57e157903e (diff)
parent6277fd91133a3566333612857510d74de60d67f4 (diff)
downloadrails-dc6da2e3701f370ce7fa997c4d4dea22998f7150.tar.gz
rails-dc6da2e3701f370ce7fa997c4d4dea22998f7150.tar.bz2
rails-dc6da2e3701f370ce7fa997c4d4dea22998f7150.zip
Merge commit 'mainstream/master'
Conflicts: railties/configs/initializers/new_rails_defaults.rb
Diffstat (limited to 'Rakefile')
0 files changed, 0 insertions, 0 deletions