1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-25 16:28:11 +00:00

Merge branch 'master' into 3.0

This commit is contained in:
grossmj 2020-10-24 16:49:28 +10:30
commit f3a7eba796

View File

@ -38,5 +38,5 @@ jobs:
git status
git commit -m "Publish API documentation"
git checkout gh-pages
git merge 3.0
git merge 3.0 -X theirs
git push