diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-01-29 08:09:32 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-01-29 08:09:32 +0000 |
| commit | 39f74e92f0785eb3da2001d93682b8d1aadd35d5 (patch) | |
| tree | c31e10fa38b7375cd0dc1271fd53bbb36c3140bf /config/environment.rb | |
| parent | 4a15f9345f4e511d2743a62b6165a9604f6b1438 (diff) | |
| parent | cfe244c66c2744d3b7cfcf17cd87098334a9b737 (diff) | |
Merge branch 'hotfix/0.6.9.2' into develop
Conflicts:
Gemfile.lock
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 d1189c43f..d580a1096 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -18,7 +18,7 @@ end # ENV['RAILS_ENV'] ||= 'production' # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.3.15' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.16' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') |