Merge branch 'ruby-2.1'

This reverts commit 616aef4394.
2014-04-25 10:55:36 -07:00
parent f0c89fea03
commit 53844af8dc
4 changed files with 8 additions and 3 deletions
--- a/config/application.rb
+++ b/config/application.rb
@@ -21,4 +21,6 @@ module Danbooru
    config.action_mailer.perform_deliveries = true
    config.log_tags = [lambda {|req| "PID:#{Process.pid}"}]
  end
+
+  I18n.enforce_available_locales = false
 end