commit ad20721630ee5dcd46598d3ae4b3aad8343fca00 Merge: c292d43 bd2b5e8 Author: emma peel <emma.peel@riseup.net> Date: Tue May 28 09:38:27 2019 +0200 merge master assets/scss/bootstrap.css | 7 +- .../relay-operations/technical-setup/contents.lr | 188 +++++++-------------- .../technical-setup/debianubuntu/contents.lr | 5 +- .../technical-setup/exit-relay/contents.lr | 90 ++++------ content/user-testing/contents.lr | 6 +- databags/menu+de.ini | 10 +- 6 files changed, 105 insertions(+), 201 deletions(-)