From: Tom Hughes Date: Thu, 30 May 2024 15:22:38 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/4857' X-Git-Tag: live~507 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d74e7628fe26ad89907b97807155f753952ecfd3?hp=15e86708f1948d5b07a08bc2a30bf315bab9c07e Merge remote-tracking branch 'upstream/pull/4857' --- diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index c02b2d376..70839d160 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -25,7 +25,7 @@
<% if @preferred_auth_provider %> <%= render :partial => "auth_providers" %> -
+
<%= t ".or" %>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index b1a85d60d..b618f3811 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -31,7 +31,7 @@ <% unless @preferred_auth_provider.nil? %> <%= render :partial => "auth_providers" %> -
+
<%= t ".or" %>