diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-29 15:46:12 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-29 15:46:12 -0800 |
| commit | b27a3e8da39484d8a02d3b9c1e4dc3cb60ddcce7 (patch) | |
| tree | 372a4af6df43eb8bed19c11e55b2f70907d60507 /ci/geminstaller.yml | |
| parent | ada895e8cac855a2f248aafdb92457365f062d07 (diff) | |
| parent | b354496bda901cb0af499d6f3dff17a96a834a67 (diff) | |
| download | rails-b27a3e8da39484d8a02d3b9c1e4dc3cb60ddcce7.tar.gz rails-b27a3e8da39484d8a02d3b9c1e4dc3cb60ddcce7.tar.bz2 rails-b27a3e8da39484d8a02d3b9c1e4dc3cb60ddcce7.zip | |
Merge branch 'master' of git://github.com/mikel/rails into mail
Conflicts:
actionmailer/lib/action_mailer.rb
Diffstat (limited to 'ci/geminstaller.yml')
| -rw-r--r-- | ci/geminstaller.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/geminstaller.yml b/ci/geminstaller.yml index 776ae8d98d..3dc2000bf9 100644 --- a/ci/geminstaller.yml +++ b/ci/geminstaller.yml @@ -5,4 +5,4 @@ gems: - name: rubygems-update version: >= 1.3.5 - name: bundler - version: >= 0.6.0 + version: >= 0.7.1 |