Merge branch '2.2' into master-3.0

# Conflicts:
#	angular.json
This commit is contained in:
grossmj 2023-12-07 11:17:28 +10:00
commit 49eee13f7c

View File

@ -31,7 +31,8 @@
"spark-md5", "spark-md5",
"xterm", "xterm",
"xterm-addon-attach", "xterm-addon-attach",
"xterm-addon-fit" "xterm-addon-fit",
"ipaddr.js"
], ],
"outputPath": "dist", "outputPath": "dist",
"index": "src/index.html", "index": "src/index.html",