Merge branch 'kaminari_version' of git://github.com/jlecour/errbit into jlecour-kaminari_version

Nathan Broadbent
2 parents 04eaf4f0 8572916a
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
Gemfile
@@ -12,7 +12,7 @@ gem &#39;useragent&#39;, &#39;~&gt; 0.3.1&#39;
 gem 'inherited_resources'
 gem 'SystemTimer', :platform => :ruby_18
 gem 'actionmailer_inline_css', "~> 1.3.0"
-gem 'kaminari'
+gem 'kaminari', '>= 0.14.1'
 gem 'rack-ssl-enforcer'
 gem 'fabrication', "~> 1.3.0"   # Used for both tests and demo data
 gem 'rails_autolink', '~> 1.0.9'
...	...	@@ -12,7 +12,7 @@ gem 'useragent', '~> 0.3.1'
12	12	gem 'inherited_resources'
13	13	gem 'SystemTimer', :platform => :ruby_18
14	14	gem 'actionmailer_inline_css', "~> 1.3.0"
15		-gem 'kaminari'
	15	+gem 'kaminari', '>= 0.14.1'
16	16	gem 'rack-ssl-enforcer'
17	17	gem 'fabrication', "~> 1.3.0" # Used for both tests and demo data
18	18	gem 'rails_autolink', '~> 1.0.9'
...	...