diff options
| author | spag <spag@golwen.net> | 2013-01-10 13:37:55 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2013-01-10 13:37:55 +0100 |
| commit | 490e3f9bcda2943d1bff77ec5cfaa0a9b7d13458 (patch) | |
| tree | 9d9e2a1e5b1da7e301675e2767acfa5ca954ea38 /Gemfile.lock | |
| parent | 6ce81a29e0918b3494a08fa47190b2cea59d1a84 (diff) | |
| parent | ae296748501982bac71525507ff9c1fdfefb8ad2 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
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) |