mirror of
https://github.com/GNS3/gns3-server
synced 2024-11-28 19:28:07 +00:00
Merge branch '3.0' into gh-pages
This commit is contained in:
commit
ebdbf38a1c
@ -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
|
||||
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user