diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-18 12:55:08 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-18 12:55:08 -0700 |
| commit | 12ed72c5ee9597cf771e22af5c090e48e7c0a1e5 (patch) | |
| tree | 0dcc178c87840e8143c912512f8d4339e3b92435 /config/environment.rb | |
| parent | a5e91dce626cb87e5f92c881c8fb3a4c38541f92 (diff) | |
| parent | 6c9e8fdd7640077728665f0bee6c6e024479076a (diff) | |
Merge branch 'hotfix/0.7.0.5' into develop
Conflicts:
Gemfile.lock
locale/cy/app.po
locale/fr/app.po
locale/he_IL/app.po
locale/id/app.po
locale/pt_BR/app.po
locale/ro_RO/app.po
locale/sr@latin/app.po
locale/uk/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 f9042857b..b1cf659bb 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.17' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.18' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') |