Mercurial > hg > soundsoftware-site
diff config/environment.rb @ 1167:54a92921cf09 cannam
Merge from live branch
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Mon, 21 Jan 2013 14:18:00 +0000 |
| parents | 579587187b77 |
| children | 16826c3afbba 68a94715fb56 |
line wrap: on
line diff
--- a/config/environment.rb Mon Jan 21 14:17:46 2013 +0000 +++ b/config/environment.rb Mon Jan 21 14:18:00 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'