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

docs(en): merge docs-next/master into vue-docs-next/main @ 6b601991 #5

Merged
merged 7 commits into from
Jun 10, 2021

Conversation

docschina-bot
Copy link
Collaborator

@docschina-bot docschina-bot commented Jun 10, 2021

此 PR 自动生成。

合并 vuejs/docs-next 的修改至本仓库(@ 6b60199

以下文件存在冲突,可能需要重新翻译:

请解决所有冲突后提交到此 pull request,可直接在 Github 修改、切换到 sync-6b601991 分支进行修改或者使用 Github Desktop 拉取此 pr 修改并提交。

禁止使用 Squash Merge 来合并此 Pull Request!

使用该操作会导致上游仓库的内容丢失,并致使下一次合并产生冲突。

NataliaTepluhina and others added 6 commits June 7, 2021 12:47
Bumps [ws](https://github.com/websockets/ws) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/commits)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Add VueSchool Summer Sale banner

* Update VueSchool Summer Sale banner
@QC-L QC-L merged commit 78c0695 into main Jun 10, 2021
@QC-L QC-L deleted the sync-6b601991 branch June 10, 2021 03:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants