Merge remote-tracking branch 'upstream/pull/3233'

[rails.git] / app / controllers / application_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6fc31953de5fddb85e579ed7eacda29b4c1cb364..2a1c3d6759c1777589f65e308e1123bde8b706fc 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -17,7 +17,6 @@ class ApplicationController < ActionController::Base
 
   helper_method :current_user
   helper_method :oauth_token
-  helper_method :preferred_languages
 
   private