aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/generators/rails/app/templates/script/about
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2010-02-04 13:14:44 +0000
committerPratik Naik <pratiknaik@gmail.com>2010-02-04 13:14:44 +0000
commit8260f0b40f8954f1822a0f856f7c0706afbba0bd (patch)
tree1ec6fe65274eeb87c2030ba2daa3e230a375e846 /railties/lib/generators/rails/app/templates/script/about
parent6241d4e5535190b817e546130cfe179b641da1ba (diff)
parent6d6e6105c074eb9f266619e77a0873635af94124 (diff)
downloadrails-8260f0b40f8954f1822a0f856f7c0706afbba0bd.tar.gz
rails-8260f0b40f8954f1822a0f856f7c0706afbba0bd.tar.bz2
rails-8260f0b40f8954f1822a0f856f7c0706afbba0bd.zip
Merge remote branch 'mainstream/master'
Conflicts: railties/guides/source/3_0_release_notes.textile
Diffstat (limited to 'railties/lib/generators/rails/app/templates/script/about')
-rwxr-xr-xrailties/lib/generators/rails/app/templates/script/about3
1 files changed, 0 insertions, 3 deletions
diff --git a/railties/lib/generators/rails/app/templates/script/about b/railties/lib/generators/rails/app/templates/script/about
deleted file mode 100755
index 93fd007649..0000000000
--- a/railties/lib/generators/rails/app/templates/script/about
+++ /dev/null
@@ -1,3 +0,0 @@
-require File.expand_path('../../config/environment', __FILE__)
-$LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info"
-require 'rails/commands/about'