Merge branch 'master' into new-design

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --cc Makefile.am
index 9b844b46720d3c04accc7bf51160637e05d1d1cd,8ca1267a83df94b5ebf835429c0938d4a63ea4ef..3f00cfb6bce0906627440ea3b932c02d6e929bb7
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -993,9 -986,11 +992,9 @@@ static_js_DATA = 
        \
        src/static/js/Control.Geocoder.min.js \
        src/static/js/editor.js \
-       src/static/js/jquery-3.3.1.min.js \
+       src/static/js/jquery-3.6.0.min.js \
        src/static/js/leaflet.min.js \
        src/static/js/maps.js \
 -      src/static/js/popper.min.js \
 -      src/static/js/popper.min.js.map \
        src/static/js/prettify.js \
        \
        src/static/js/zxcvbn/dist/zxcvbn.js \

diff --cc src/backend/accounts.py
Simple merge

diff --cc src/backend/fireinfo.py
Simple merge

diff --cc src/scss/style.scss
Simple merge

diff --cc src/templates/location/index.html
Simple merge