aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2010-06-01 16:39:05 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2010-06-01 16:39:05 -0500
commitcae25199008bc26d215e7af5558cfcdfdc6ec264 (patch)
tree9b1cd9bf1a2a770af31406652362001460816e5b /Gemfile
parentd57397c4b62b6474ff8eb55bfd763f5e6dcdcd40 (diff)
parenta0bb1dda119a7488b8a4d61b354a64e619b0d1b3 (diff)
downloadrails-cae25199008bc26d215e7af5558cfcdfdc6ec264.tar.gz
rails-cae25199008bc26d215e7af5558cfcdfdc6ec264.tar.bz2
rails-cae25199008bc26d215e7af5558cfcdfdc6ec264.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile6
1 files changed, 6 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 214fdf77da..d57afc8630 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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'