Merge branch '2.2' into 3.0

# Conflicts:
#	gns3server/controller/__init__.py
#	gns3server/controller/appliance_manager.py
#	gns3server/crash_report.py
#	gns3server/run.py
#	gns3server/static/web-ui/index.html
#	gns3server/utils/images.py
#	gns3server/version.py
#	requirements.txt
#	scripts/update-bundled-web-ui.sh
This commit is contained in:
grossmj committed 2023-08-10 15:00:22 +10:00
commit fe90d2b146
19 files changed
+310 -34

No files matched your search

+5
View File
@@ -98,3 +98,8 @@ yarn ng build --source-map=false --build-optimizer=false --configuration=product
cp -R $REPO_DIR/dist/* "$GNS3SERVER_DIR/gns3server/static/web-ui/"
cd "$GNS3SERVER_DIR"
git add gns3server/static/web-ui/*
if [[ -n "$TAG" ]]
then
git commit -m "Bundle web-ui ${TAG}"
fi