Merge branch 'groonga'

[tdcgexplorer/nimono.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 39fdff3..c262351 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,6 +38,8 @@ GEM
       abstract (>= 1.0.0)
     i18n (0.5.0)
     i18n_generators (1.0.3)
+    kaminari (0.12.4)
+      rails (>= 3.0.0)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -85,7 +87,6 @@ GEM
     treetop (1.4.9)
       polyglot (>= 0.3.1)
     tzinfo (0.3.29)
-    will_paginate (3.0.pre2)
 
 PLATFORMS
   ruby
@@ -93,7 +94,7 @@ PLATFORMS
 DEPENDENCIES
   activegroonga (= 1.0.4)
   i18n_generators
+  kaminari
   pg (= 0.10.1)
   rails (= 3.0.6)
   rspec-rails (= 2.6.1)
-  will_paginate (= 3.0.pre2)