Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into rails3
Conflicts:
	thinking-sphinx.gemspec
  • Loading branch information
pat committed Nov 4, 2011
2 parents 42a120d + a95fb57 commit d090f64
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion thinking-sphinx.gemspec
Expand Up @@ -21,7 +21,7 @@ Gem::Specification.new do |s|
s.require_paths = ['lib']

s.add_runtime_dependency 'activerecord', '>= 3.0.3'
s.add_runtime_dependency 'riddle', '>= 1.3.3'
s.add_runtime_dependency 'riddle', '>= 1.5.0'
s.add_runtime_dependency 'builder', '>= 2.1.2'

s.add_development_dependency 'actionpack', '>= 3.0.3'
Expand Down

0 comments on commit d090f64

Please sign in to comment.