From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 28 Nov 2021 12:15:45 +0000 (+0000)
Subject: Merge branch 'master' into new-design
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dda2ace8f8180fb0819829f03f1e1edfcea74106;p=ipfire.org.git

Merge branch 'master' into new-design

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

dda2ace8f8180fb0819829f03f1e1edfcea74106
diff --cc Makefile.am
index 9b844b46,8ca1267a..3f00cfb6
--- a/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 \