diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-01-09 09:57:14 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-01-09 09:57:14 +0000 |
| commit | 9fc2131f5015ae30f41b418c6564fae58704901c (patch) | |
| tree | 1cae26d0c67f2284a8d170b94b4f2b15269cff12 /config/environment.rb | |
| parent | a21fc622126eee69467b89aec9a425dbd3f96feb (diff) | |
| parent | a2ba832d4a2cbe656a8366a2958cba708a20dfc2 (diff) | |
Merge branch 'hotfix/0.6.8.3' into develop
Conflicts:
Gemfile.lock
locale/ar/app.po
locale/cs/app.po
locale/cy/app.po
locale/en_IE/app.po
locale/es/app.po
locale/pt_BR/app.po
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 5670aed0b..b32eeeb01 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.14' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.15' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') |