Merge branch 'master' of github.com:fetsite/fetsite

Conflicts: Gemfile.lock
2014-02-23 14:30:26 +01:00
parent aa2ef0955c 14b42ef33a
commit 28dd49bbee
5 changed files with 42 additions and 39 deletions
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -51,7 +51,7 @@ Fetsite::Application.configure do
  # config.action_controller.asset_host = "http://assets.example.com"

  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  # config.assets.precompile += %w( search.js )
+  # config.assets.precompile += %w( search.js  )

  # Disable delivery errors, bad email addresses will be ignored
  # config.action_mailer.raise_delivery_errors = false
--- a/config/initializers/locale.rb
+++ b/config/initializers/locale.rb
@@ -1 +1 @@
-I18n.default_locale = :de
+I18n.default_locale = :de