diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-09-05 12:32:17 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-09-05 12:32:17 +0100 |
| commit | 7f0ae82d44873b53cc87c659b42415ce4866c7b4 (patch) | |
| tree | fdce14b0658bb05aef087dd4e09dc25c9a79ea8c /config/environment.rb | |
| parent | 2926ee877bcf8974c529e1271ded42971fe0d632 (diff) | |
| parent | 96c4dd912083edcd0c9eda76bd2301bb4a1a6d53 (diff) | |
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop, fix conflicts
Diffstat (limited to 'config/environment.rb')
| -rw-r--r-- | config/environment.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/environment.rb b/config/environment.rb index 3abfd3d22..2f7967cdc 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -61,7 +61,7 @@ Rails::Initializer.run do |config| config.gem "gettext", :version => '>=1.9.3' config.gem "fast_gettext", :version => '>=0.4.8' config.gem "rack", :version => '1.1.0' - config.gem "rdoc", :version => '2.4.3' + config.gem "rdoc", :version => '>=2.4.3' config.gem "recaptcha", :lib => "recaptcha/rails" config.gem 'rspec', :lib => false, :version => '1.3.1' config.gem 'rspec-rails', :lib => false, :version => '1.3.3' |