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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 8df126a04e3a5ea02325b652dc0f0432cf08b5ab..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_langauges
 
   private