commit 69473b8b0f1537827fa14de10c483ca73d77ffc6 Merge: dae61c3a c2d42b4c Author: gus <gus@torproject.org> Date: Thu Aug 20 16:26:51 2020 -0400 Merge branch '404-template' into staging assets/static/images/404.png | Bin 0 -> 17744 bytes content/404.html/contents.lr | 3 +++ templates/404.html | 1 + 3 files changed, 4 insertions(+)