diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-30 17:52:08 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-30 17:52:08 +0100 |
| commit | 1c448d647488dc3dd3b72e9fe15efb971612157c (patch) | |
| tree | 2b31e4ed019a29043aa07d9d95e7f8b64e309bbd /app/views | |
| parent | 7e18e95716052d5566f2e31559cbe4a68268f493 (diff) | |
| parent | 66019b0ec4aaa584e58e91583425ed7c0d55c28e (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/auth/registrations/_sessions.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/auth/registrations/_sessions.html.haml b/app/views/auth/registrations/_sessions.html.haml index 8586c0549..d7d96a1bb 100644 --- a/app/views/auth/registrations/_sessions.html.haml +++ b/app/views/auth/registrations/_sessions.html.haml @@ -8,7 +8,7 @@ %th= t 'sessions.browser' %th= t 'sessions.ip' %th= t 'sessions.activity' - %td + %th %tbody - @sessions.each do |session| %tr |