[tor-commits] [tpo/translations] Merge branch 'master' into translations

[emmapeel at torproject.org]

commit 25035fa2d0b742ea3401e377920252c40c770f55
Merge: 5623776 f82d828
Author: emma peel <emma.peel at riseup.net>
Date:   Tue Nov 26 12:00:08 2019 +0100

    Merge branch 'master' into translations

 templates/about.html    | 2 +-
 templates/homepage.html | 2 +-
 templates/layout.html   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)