Merge branch '2.2' into 3.1

# Conflicts:
#	gns3server/handlers/api/controller/template_handler.py
#	tests/handlers/api/controller/test_template.py
This commit is contained in:
grossmj committed 2026-07-06 18:13:17 +02:00
commit d54b16df53
10 files changed
+215 -9

No files matched your search

@@ -12,11 +12,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
fetch-depth: 0
ref: "gh-pages"
- uses: actions/setup-python@v5
- uses: actions/setup-python@v6
with:
python-version: 3.12
- name: Merge changes from 3.0 branch