diff options
author | Olli Jokinen <olli.jokinen@enemy.fi> | 2011-12-01 15:32:59 +0200 |
---|---|---|
committer | Olli Jokinen <olli.jokinen@enemy.fi> | 2011-12-01 15:32:59 +0200 |
commit | b4e1903d23a760028d58bc3bb20a1d491bfd4a4b (patch) | |
tree | a40bdce1bd4800124ab6eaed2a6be017bf9cfd3d /bin | |
parent | fae9ad9c712decef70b379f5aa1faa0149902831 (diff) | |
parent | 1e51cd957e3c90f4be35f1f0c4c380d8f7d40d66 (diff) | |
download | rails-b4e1903d23a760028d58bc3bb20a1d491bfd4a4b.tar.gz rails-b4e1903d23a760028d58bc3bb20a1d491bfd4a4b.tar.bz2 rails-b4e1903d23a760028d58bc3bb20a1d491bfd4a4b.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/rails | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/bin/rails b/bin/rails deleted file mode 100755 index f9725d78d0..0000000000 --- a/bin/rails +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env ruby - -if File.exists?(File.join(File.expand_path('../..', __FILE__), '.git')) - railties_path = File.expand_path('../../railties/lib', __FILE__) - $:.unshift(railties_path) -end -require "rails/cli" |