Merge branch '2.2' into master-3.0

# Conflicts: # angular.json
GNS3 · Dec 7, 2023 · 49eee13 · 49eee13
2 parents 6bb451e + 21ed977
commit 49eee13
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/angular.json b/angular.json
@@ -31,7 +31,8 @@
                             "spark-md5",
                             "xterm",
                             "xterm-addon-attach",
-                            "xterm-addon-fit"
+                            "xterm-addon-fit",
+                            "ipaddr.js"
                         ],
                         "outputPath": "dist",
                         "index": "src/index.html",