NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-03 14:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 3.0

Browse Source
This commit is contained in:
grossmj committed 2020-10-24 16:49:28 +10:30
2 parents b2d81609be 0f154e5f29
commit f3a7eba796
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/publish_api_documentation.yml
+1 -1
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