arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 19:28:07 +00:00
Code Issues Releases Wiki Activity

Merge branch '3.0' into gh-pages

Browse Source
This commit is contained in:
grossmj 2020-10-24 16:50:04 +10:30
commit ebdbf38a1c
2 changed files with 2 additions and 2 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

2
docs/openapi.json
View File

File diff suppressed because one or more lines are too long