commit 1cb3fbbd846b571b8973e6ee8445cd2eef37c104 Merge: f8fa754 b7d1e5f Author: hiro <hiro at torproject.org> Date: Fri Apr 26 15:08:32 2019 +0200 Merge remote-tracking branch 'anto/master' templates/footer.html | 1 + templates/navbar.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)