diff options
| author | wycats <wycats@gmail.com> | 2010-06-02 15:53:10 +0200 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-06-02 15:53:10 +0200 |
| commit | 26c5680bd01bd0e525eccc5d47a2e7126d9383f7 (patch) | |
| tree | c655c56511ef89ba55c554a0aa7d82b1cd062f78 /Gemfile | |
| parent | b870daba5ff71973b237616fb95f90bb321ae7fb (diff) | |
| parent | 4b91daff13be43ed913a97ffc8ad1b3f77fd9690 (diff) | |
| download | rails-26c5680bd01bd0e525eccc5d47a2e7126d9383f7.tar.gz rails-26c5680bd01bd0e525eccc5d47a2e7126d9383f7.tar.bz2 rails-26c5680bd01bd0e525eccc5d47a2e7126d9383f7.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -21,6 +21,12 @@ elsif RUBY_ENGINE == "jruby" gem "jruby-openssl" end +# AS +gem "memcache-client", ">= 1.7.5" + +# AM +gem "text-format", "~> 1.0.0" + # AR if mri || RUBY_ENGINE == "rbx" gem "sqlite3-ruby", "= 1.3.0.beta.2", :require => 'sqlite3' @@ -39,7 +45,6 @@ elsif RUBY_ENGINE == "jruby" end # AP -gem "rack-test", "0.5.3", :require => 'rack/test' gem "RedCloth", ">= 4.2.2" group :documentation do |