Fix merge. ...Again.
authorPete <pete@debu.gs>
Sun, 17 Jan 2021 10:40:58 +0000 (02:40 -0800)
committerPete <pete@debu.gs>
Sun, 17 Jan 2021 10:40:58 +0000 (02:40 -0800)
commitb5d7340b2ae9730d8da88715b5c78439b2081f19
tree231dca11bd8333f8d638a9952be0c6e3963ff547
parent0fb305dfbc2fa7df7c0e75ae824d8c90c7de6a58
Fix merge.  ...Again.
static/style.css
templates/notification.tmpl