diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-06-30 20:47:26 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-30 20:47:26 +0200 |
| commit | c63cf7bf0db708fe46a929cf57649ab5a92034af (patch) | |
| tree | 8f0974852b51597652e6ae73da26f3eb80fe878b /Gemfile | |
| parent | 52c56f9f7ec46ee39f1a6319ff4017e2492683ed (diff) | |
| parent | b07e6fdaa0aa07016d1425ada5b7f966142d0212 (diff) | |
| download | rails-c63cf7bf0db708fe46a929cf57649ab5a92034af.tar.gz rails-c63cf7bf0db708fe46a929cf57649ab5a92034af.tar.bz2 rails-c63cf7bf0db708fe46a929cf57649ab5a92034af.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ source 'http://rubygems.org' gem "arel", :git => "git://github.com/rails/arel.git" -gem "rack-mount", :git => "git://github.com/rails/rack-mount.git" +#gem "rack-mount", :git => "git://github.com/rails/rack-mount.git" gem "rails", :path => File.dirname(__FILE__) gem "rake", ">= 0.8.7" |