Revert "Merge branch 'ruby-2.1'"

This reverts commit 18dd5acca7, reversing
changes made to 55fef2f7c6.
This commit is contained in:
r888888888
2014-04-24 16:12:30 -07:00
parent 18dd5acca7
commit 616aef4394
4 changed files with 3 additions and 8 deletions

View File

@@ -21,6 +21,4 @@ module Danbooru
config.action_mailer.perform_deliveries = true
config.log_tags = [lambda {|req| "PID:#{Process.pid}"}]
end
I18n.enforce_available_locales = false
end