Merge branch 'master' into openstreetbugs

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index d5cee81e1407ae1b27c519a861099fb0791f0083..adf15da35cfc21164198317865856d097eb53d69 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present

-RAILS_GEM_VERSION = '2.3.8' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION

 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')