Permalink
Browse files

Merge branch 'master' of git@github.com:opsb/reportz

  • Loading branch information...
2 parents 07a5a7e + f9588f7 commit 2bd0a1618d19e1d79eb8ae6da82e4262b77a4332 Oliver Searle-Barnes committed Mar 22, 2010
Showing with 2 additions and 2 deletions.
  1. +2 −2 config/environment.rb
View
4 config/environment.rb 100644 → 100755
@@ -1,7 +1,7 @@
# Be sure to restart your server when you modify this file
# Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')
@@ -38,4 +38,4 @@
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
# config.i18n.default_locale = :de
-end
+end

0 comments on commit 2bd0a16

Please sign in to comment.