Merge remote-tracking branch 'upstream/pull/2494'
authorTom Hughes <tom@compton.nu>
Sun, 5 Jan 2020 18:51:42 +0000 (18:51 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 5 Jan 2020 18:51:42 +0000 (18:51 +0000)
commita570f59187efa0a298d31bae2b224de9762bb42f
tree525c337fc0b74f771a206200e8956268af89e195
parent6c22bf4b9afb26af56430ec9f9e191502fb0ee60
parent53f2c36f1d4ea04ad3539dc3450f0af49d46a671
Merge remote-tracking branch 'upstream/pull/2494'
app/views/oauth_clients/index.html.erb
app/views/site/about.html.erb
app/views/site/copyright.html.erb
app/views/traces/_trace.html.erb
app/views/traces/show.html.erb
config/locales/en.yml