diff options
| author | Peter Kozak <spag@golwen.net> | 2013-05-05 09:54:20 +0200 |
|---|---|---|
| committer | Peter Kozak <spag@golwen.net> | 2013-05-05 09:54:20 +0200 |
| commit | 590ef7db21af6bdf670f55b74afed478d9127492 (patch) | |
| tree | dc4030d5fa6813299ca687ea55ee644a715ec80d /Gemfile.lock | |
| parent | 8968171f9cee1e3c4e5a9267484585a8c99c4c43 (diff) | |
| parent | ac2099b51a2e1ae846daa8a5fa854d19a52ea05d (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f286709..d133ae6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -209,6 +209,8 @@ GEM chronic (>= 0.6.3) whois (2.7.0) will_paginate (3.0.4) + will_paginate-bootstrap (0.2.2) + will_paginate (>= 3.0.3) yajl-ruby (1.1.0) PLATFORMS |