diff options
| author | spag <spag@golwen.net> | 2013-01-29 09:32:57 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2013-01-29 09:32:57 +0100 |
| commit | 24f613cac47fae29a48dab351e9ee195f5b53eed (patch) | |
| tree | 6a5c05313b58c29fd2799c65d26872d782d69921 /Gemfile.lock | |
| parent | 53a98b21f031b429f14a9cd9ec2feeb040a633db (diff) | |
| parent | 5f603012881517483df0c9e4473d0aacdde66655 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a1ee949..33e77ff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -61,7 +61,7 @@ GEM compass (>= 0.12.2, < 0.14) cookiejar (0.3.0) daemons (1.1.9) - dalli (2.6.0) + dalli (2.6.2) delayed_job (3.0.4) activesupport (~> 3.0) delayed_job_active_record (0.3.3) @@ -79,10 +79,10 @@ GEM eventmachine (1.0.0) execjs (1.4.0) multi_json (~> 1.0) - factory_girl (4.1.0) + factory_girl (4.2.0) activesupport (>= 3.0.0) - factory_girl_rails (4.1.0) - factory_girl (~> 4.1.0) + factory_girl_rails (4.2.0) + factory_girl (~> 4.2.0) railties (>= 3.0.0) faye (0.8.8) cookiejar (>= 0.3.0) @@ -93,20 +93,20 @@ GEM yajl-ruby (>= 1.0.0) faye-websocket (0.4.6) eventmachine (>= 0.12.0) - fssm (0.2.9) + fssm (0.2.10) haml (3.1.7) hike (1.2.1) - hirb (0.7.0) + hirb (0.7.1) http_accept_language (1.0.2) http_parser.rb (0.5.3) i18n (0.6.1) inifile (2.0.2) journey (1.0.4) - jquery-rails (2.1.4) + jquery-rails (2.2.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.7.6) - kgio (2.7.4) + kgio (2.8.0) macaddr (1.6.1) systemu (~> 2.5.0) mail (2.4.4) @@ -178,7 +178,7 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.16.0) + thor (0.17.0) tilt (1.3.3) treetop (1.4.12) polyglot |