1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-25 01:38:08 +00:00

Merge branch '3.0' into gh-pages

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

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

File diff suppressed because one or more lines are too long