Skip to content

Commit 31f90c7

Browse files
MachinisteWebMachinisteWeb
committed
Merge remote-tracking branch 'upstream/master' into working
# Conflicts resolved: # README.md # docs/README.md # docs/guide/README.md # docs/guide/build-config.md # docs/guide/bundle-renderer.md # docs/guide/caching.md # docs/guide/css.md # docs/guide/hydration.md # docs/guide/streaming.md # docs/guide/structure.md # docs/guide/universal.md # en/SUMMARY.md # en/api.md
2 parents 1927dec + ca042b4 commit 31f90c7

File tree

134 files changed

+10670
-598
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+10670
-598
lines changed

‎.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
node_modules
22
.DS_Store
3-
_book
4-
test
3+
.idea
4+
docs/.vuepress/dist

‎CNAME

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎LANGS.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎book.json

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎deploy.sh

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎en/README.md renamed to ‎docs-gitbook/fr/README.md

‎fr/api.md renamed to ‎docs-gitbook/fr/api.md

‎en/basic.md renamed to ‎docs-gitbook/fr/basic.md

‎en/build-config.md renamed to ‎docs-gitbook/fr/build-config.md

‎en/bundle-renderer.md renamed to ‎docs-gitbook/fr/bundle-renderer.md

0 commit comments

Comments
 (0)