diff config/environment.rb @ 1209:1b1138f6f55e

Merge from branch live
author Chris Cannam
date Wed, 23 Jan 2013 13:11:25 +0000
parents 579587187b77
children 16826c3afbba 68a94715fb56
line wrap: on
line diff
--- a/config/environment.rb	Wed Nov 21 17:56:50 2012 +0000
+++ b/config/environment.rb	Wed Jan 23 13:11:25 2013 +0000
@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.15' unless defined? RAILS_GEM_VERSION
 
 if RUBY_VERSION >= '1.9'
   Encoding.default_external = 'UTF-8'