Akira Matsuda 569c83f1ef Merge branch 'pass-test-suite' of github.com:wbyoung/kaminari ... Conflicts: spec/models/active_record/active_record_relation_methods_spec.rb		2013-11-10 03:00:29 +09:00
..
generators/kaminari	Merge pull request #279 from eitoball/issue_271	2012-09-04 16:06:18 -07:00
kaminari	Merge branch 'pass-test-suite' of github.com:wbyoung/kaminari	2013-11-10 03:00:29 +09:00
kaminari.rb	Revert "An Engine can include app/helpers, so let's move the helpers there"	2013-11-10 02:58:22 +09:00