diff options
| author | spag <spag@golwen.net> | 2013-01-16 23:09:38 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2013-01-16 23:09:38 +0100 |
| commit | e398d40c7ae15af9c840d0cda901303db8f22c39 (patch) | |
| tree | 7319eb2cc22339e4efee4caf5fd67bcaababf6bf /Gemfile.lock | |
| parent | 8fd56dfe3d2bca6ccd9353031947ae4a8dca4528 (diff) | |
| parent | c2f63b8bf288903a68c562cdf9353e6840a7cb61 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e4deaeb..0beeb3b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -100,6 +100,7 @@ GEM railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.7.6) + kgio (2.7.4) macaddr (1.6.1) systemu (~> 2.5.0) mail (2.4.4) @@ -137,6 +138,7 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) + raindrops (0.10.0) rake (10.0.3) rdoc (3.12) json (~> 1.4) @@ -170,6 +172,10 @@ GEM uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) + unicorn (4.5.0) + kgio (~> 2.6) + rack + raindrops (~> 0.7) uuid (2.3.6) macaddr (~> 1.0) will_paginate (3.0.4) @@ -209,5 +215,6 @@ DEPENDENCIES state_machine strong_parameters uglifier (>= 1.3.0) + unicorn uuid will_paginate |