Merge branch 'master' into 3.0

# Conflicts:
#	.github/workflows/testing.yml
#	Dockerfile
#	gns3server/version.py
This commit is contained in:
grossmj committed 2021-10-09 12:16:50 +10:30
commit 0b200def88
17 files changed
+60 -66

No files matched your search

+1 -2
View File
@@ -13,11 +13,10 @@ on:
jobs:
build:
runs-on: ${{ matrix.os }}
runs-on: ubuntu-latest
strategy:
matrix:
os: [ubuntu-latest]
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
steps: