mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-03 14:01:15 +02:00
Merge branch '2.2' into 3.0
# Conflicts: # CHANGELOG # docs/api/notifications/link.updated.json # docs/api/notifications/log.warning.json # docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodes.rst # docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst # docs/api/v2/compute/iou/projectsprojectidiounodes.rst # docs/api/v2/compute/project/projects.rst # docs/api/v2/compute/qemu/projectsprojectidqemunodes.rst # docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst # docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstart.rst # docs/api/v2/controller/link/projectsprojectidlinks.rst # docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst # docs/api/v2/controller/link/projectsprojectidlinkslinkidstartcapture.rst # docs/api/v2/controller/project/projects.rst # docs/api/v2/controller/project/projectsprojectidduplicate.rst # docs/controller_notifications.rst # docs/curl.rst # docs/gns3_file.json # docs/project_notifications.rst # gns3server/compute/qemu/qemu_vm.py # gns3server/controller/project.py # gns3server/crash_report.py # gns3server/schemas/ethernet_hub.py # gns3server/schemas/ethernet_switch.py # gns3server/static/web-ui/3rdpartylicenses.txt # gns3server/static/web-ui/index.html # gns3server/utils/asyncio/telnet_server.py # gns3server/version.py # gns3server/web/web_server.py # requirements.txt # tests/controller/test_project.py # tests/controller/test_topology.py # tests/handlers/api/controller/test_project.py
This commit is contained in:
34 files changed
+483
-168
No files matched your search
@@ -18,7 +18,7 @@ jobs:
|
||||
ref: "gh-pages"
|
||||
- uses: actions/setup-python@v3
|
||||
with:
|
||||
python-version: 3.7
|
||||
python-version: 3.8
|
||||
- name: Merge changes from 3.0 branch
|
||||
run: |
|
||||
git config user.name github-actions
|
||||
|
||||
Reference in new issue
Block a user