commit e8d695e9b91a459e3bfba4f90cb292e8ede63cff Merge: 0edb2a7 c8ccd63 Author: emma peel emma.peel@riseup.net Date: Sat Mar 2 02:51:03 2019 +0100

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

.gitignore | 3 ++ assets/scss/_tor.scss | 2 +- assets/scss/_tpo.scss | 9 +++++- assets/static/bootstrap.css | 8 ++++- assets/static/bootstrap.css.map | 2 +- content/about/history/contents.lr | 35 +++++++++++----------- content/projects/contents.lr | 5 ++++ .../torbrowser/RecommendedTBBVersions/contents.lr | 16 ++++++++++ content/projects/torbrowser/contents.lr | 5 ++++ databags/versions.ini | 8 ++--- models/text.ini | 7 +++++ templates/empty.html | 7 ++--- templates/footer.html | 5 ++-- templates/home.html | 4 +-- templates/navbar.html | 2 +- 15 files changed, 83 insertions(+), 35 deletions(-)