[tor-commits] [tpo/staging] Merge branch 'master' of https://github.com/holantonela/tpo

[emmapeel at torproject.org]

commit 387f14008901b0131610316a9eb116ae1178cefd
Merge: dbc9857 7bd1eea
Author: Antonela <hola at antonela.me>
Date:   Tue Apr 16 12:49:46 2019 -0300

    Merge branch 'master' of https://github.com/holantonela/tpo

 assets/scss/_illos.scss         | 15 +++++++++++++++
 assets/scss/bootstrap.scss      |  1 +
 assets/static/bootstrap.css     | 11 +++++++++++
 assets/static/bootstrap.css.map |  4 ++--
 assets/static/js/fallback.js    | 13 +++++++++++++
 templates/download.html         |  2 +-
 templates/home.html             | 20 ++++++++++----------
 templates/navbar.html           |  2 +-
 8 files changed, 54 insertions(+), 14 deletions(-)