Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add server submodule back #673

Merged
merged 1 commit into from
Jul 10, 2020
Merged

Add server submodule back #673

merged 1 commit into from
Jul 10, 2020

Conversation

snukky
Copy link
Member

@snukky snukky commented Jul 10, 2020

Description

The src/3rd_party/simple-websocket-server submodule has been accidentally removed during the last repo sync. Our CI did not detect this because workspace was not cleared out. This PR just adds the submodule back.

Checklist

  • I have tested the code manually
  • I have run regression tests
  • I have read and followed CONTRIBUTING.md
  • I have updated CHANGELOG.md

@snukky snukky merged commit 2d75042 into master Jul 10, 2020
emjotde pushed a commit that referenced this pull request Aug 18, 2020
This PR pulls recent changes from the public repo.

In particular, it adds back the submodule for marian-server, which has been accidentally removed during the last sync into the public marian-dev. See the original PR in the public repo: #673
@snukky snukky deleted the fix-server-submodule branch April 12, 2021 11:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant