Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

master
Jenkins 7 years ago
commit 9fa79bc317
  1. 2
      app/views/auth/registrations/_sessions.html.haml

@ -16,7 +16,7 @@
%span{ title: session.user_agent }< %span{ title: session.user_agent }<
= fa_icon "#{session_device_icon(session)} fw", 'aria-label' => session_device_icon(session) = fa_icon "#{session_device_icon(session)} fw", 'aria-label' => session_device_icon(session)
= ' ' = ' '
= t 'sessions.description', browser: t("sessions.browsers.#{session.browser}"), platform: t("sessions.platforms.#{session.platform}") = t 'sessions.description', browser: t("sessions.browsers.#{session.browser}", default: "#{session.browser}"), platform: t("sessions.platforms.#{session.platform}", default: "#{session.platform}")
%td %td
%samp= session.ip %samp= session.ip
%td %td

Loading…
Cancel
Save