Skip to content

[Doc EN]: 2017 dec - 2018 jan #2030

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

Merged
merged 20 commits into from
Jan 29, 2018
Merged

[Doc EN]: 2017 dec - 2018 jan #2030

merged 20 commits into from
Jan 29, 2018

Conversation

MachinisteWeb
Copy link
Contributor

Update to set french documentation up-to-date with english one.

MachinisteWeb and others added 19 commits September 26, 2017 08:35
Signed-off-by: Bruno Lesieur <[email protected]>
Signed-off-by: Bruno Lesieur <[email protected]>
Signed-off-by: Bruno Lesieur <[email protected]>
Signed-off-by: Bruno Lesieur <[email protected]>
Signed-off-by: Bruno Lesieur <[email protected]>
Signed-off-by: Bruno Lesieur <[email protected]>
# Conflicts:
#	docs/fr/essentials/getting-started.md

Signed-off-by: Bruno Lesieur <[email protected]>
Signed-off-by: Bruno Lesieur <[email protected]>
Signed-off-by: Bruno Lesieur <[email protected]>
Signed-off-by: Bruno Lesieur <[email protected]>
Signed-off-by: MachinisteWeb <[email protected]>
Signed-off-by: MachinisteWeb <[email protected]>
@MachinisteWeb
Copy link
Contributor Author

Hi @posva !

This is ready to merge !


**Note** : _mettons de côté la partie HTML / CSS de cette disposition et concentrons nous sur le composant utilisé en lui-même._

La section `<template>` pour le composant `UserSettings` de la disposition ci-dessus devrait ressemblé à quelque chose comme cela :
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ressembler

@posva posva merged commit 39402d1 into vuejs:dev Jan 29, 2018
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.

2 participants