[tor-commits] [tpo/master] Merge branch 'staging' of https://git.torproject.org/project/web/tpo into HEAD

[hiro at torproject.org]

commit 697c133324f1e25fe5385c4b7c6349ccb8a5f03d
Merge: 570885b b70c483
Author: emma peel <emma.peel at riseup.net>
Date:   Wed Feb 6 17:25:49 2019 +0100

    Merge branch 'staging' of https://git.torproject.org/project/web/tpo into HEAD

 templates/about.html   |  4 ++--
 templates/contact.html | 34 +++++++++++++++---------------
 templates/press.html   | 56 ++++++++++++++++++++++++++++++--------------------
 3 files changed, 53 insertions(+), 41 deletions(-)