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-fr/main @ 01079969 #13

Merged
merged 4 commits into from
Jun 8, 2021

Conversation

docschina-bot
Copy link
Collaborator

This PR was automatically generated.

Merge changes from slidevjs/docs(@ 0107996

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-01079969 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.

@ArthurDanjou ArthurDanjou merged commit f6496b5 into main Jun 8, 2021
@ArthurDanjou ArthurDanjou deleted the sync-01079969 branch June 8, 2021 08:37
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.

4 participants