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/main into docs-es/main @ aa8c4cad #127

Open
wants to merge 67 commits into
base: main
Choose a base branch
from

Conversation

docschina-bot
Copy link
Collaborator

This PR was automatically generated.

Merge changes from slidevjs/docs(@ aa8c4ca

The following files have conflicts and may need new translations:

Please fix the conflicts by pushing new commits to this pull request, either by editing the files directly on GitHub, or switch to the sync-aa8c4cad branch to make changes.

DO NOT SQUASH MERGE THIS PULL REQUEST!

Doing so will "erase" the commits from upstream and cause them to show up as conflicts the next time we merge.

tonai and others added 30 commits February 24, 2023 14:15
antfu and others added 29 commits November 16, 2023 11:26
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.

None yet