arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-01 04:38:12 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 3.0

Browse Source
This commit is contained in:
grossmj 2020-10-24 16:49:28 +10:30
commit f3a7eba796
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/publish_api_documentation.yml vendored
View File

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