commit 7bd1eeaf211dc651e88b7cdaaaf76ac54ad9c700 Merge: 55f39ff 1116a29 Author: Antonela <hola@antonela.me> Date: Tue Apr 16 12:06:03 2019 -0300 Merge pull request #17 from torproject/master rebase 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(-)