From: Tom Hughes Date: Wed, 21 Jul 2021 17:32:41 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/3265' X-Git-Tag: live~2826 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/895ed778c1f382100e2f1dd1154aac86112ae0a5?hp=191d7f371031cec6a1b83157d3e9f17dee787075 Merge remote-tracking branch 'upstream/pull/3265' --- diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 8df126a04..2a1c3d675 100644 --- 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