Permalink
Browse files

Merge branch 'master' into burritos

  • Loading branch information...
2 parents 48a7f83 + d47cd08 commit f009e2c5f37bfaf72de444f0c4aa01fef954edca @justincampbell committed Aug 16, 2012
Showing with 3 additions and 0 deletions.
  1. +1 −0 Gemfile
  2. +2 −0 Gemfile.lock
View
@@ -23,6 +23,7 @@ end
group :production do
gem 'dalli'
+ gem 'memcachier'
gem 'pg'
end
View
@@ -108,6 +108,7 @@ GEM
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
+ memcachier (0.0.1)
mime-types (1.19)
multi_json (1.3.6)
multipart-post (1.1.5)
@@ -232,6 +233,7 @@ DEPENDENCIES
guard-rspec
heroku
jquery-rails
+ memcachier
newrelic_rpm
pg
rails

0 comments on commit f009e2c

Please sign in to comment.