summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-10 12:30:07 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-10 12:30:07 +0100
commitd92595edd1febbea58ccee742ac7b8cdb3b42e00 (patch)
tree78b496ed4d9f051c616c38fa9134f3401d5febb9 /Gemfile.lock
parent7268fbc3b37ae35993a7379cc66221c5e24c2016 (diff)
parent2b57fadfebf7f7df6a589ab089eec522413e8390 (diff)
Merge branch 'cache_gs_parameter_view' into develop
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock3
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 8c13c02..bafe83f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -34,6 +34,8 @@ GEM
bcrypt-ruby (3.0.1)
breadcrumbs_on_rails (2.2.0)
builder (3.0.0)
+ cache_digests (0.2.0)
+ actionpack (>= 3.2)
cancan (1.6.7)
carrierwave (0.5.8)
activesupport (~> 3.0)
@@ -176,6 +178,7 @@ DEPENDENCIES
acts_as_list
bcrypt-ruby
breadcrumbs_on_rails
+ cache_digests
cancan
carrierwave
coffee-rails (~> 3.2.1)