569c83f1ef
Conflicts: spec/models/active_record/active_record_relation_methods_spec.rb |
||
---|---|---|
.. | ||
generators/kaminari | ||
kaminari | ||
kaminari.rb |
569c83f1ef
Conflicts: spec/models/active_record/active_record_relation_methods_spec.rb |
||
---|---|---|
.. | ||
generators/kaminari | ||
kaminari | ||
kaminari.rb |