Merge remote-tracking branch 'upstream/master'

Author: MachinisteWeb

src/v2/guide/list.md

@@ -262,7 +262,7 @@ Vue.component('todo-item', {
   template: '\
     <li>\
       {{ title }}\
-      <button v-on:click="$emit('remove')">X</button>\
+      <button v-on:click="$emit(\'remove\')">X</button>\
     </li>\
   ',
   props: ['title']
@@ -309,7 +309,7 @@ Vue.component('todo-item', {
   template: '\
     <li>\
       {{ title }}\
-      <button v-on:click="$emit('remove')">X</button>\
+      <button v-on:click="$emit(\'remove\')">X</button>\
     </li>\
   ',
   props: ['title']

src/v2/guide/team.md

@@ -206,7 +206,8 @@ order: 31
     'Bangalore, India': [12.971599, 77.594563],
     'Kingston, Jamaica': [18.017874, -76.809904],
     'Tehran, Iran': [35.689197, 51.388974],
-    'Shanghai, China': [31.230390, 121.473702]
+    'Shanghai, China': [31.230390, 121.473702],
+    'Annecy, France': [45.899247, 6.129384]
   }
   var languageNameFor = {
     en: 'English',
@@ -612,6 +613,25 @@ order: 31
       reposPersonal: [
         'elemefe/element', 'elemefe/mint-ui'
       ]
+    },
+    {
+      name: 'Bruno Lesieur',
+      title: 'French Community Directeur',
+      city: 'Annecy, France',
+      languages: ['fr', 'en'],
+      github: 'Haeresis',
+      twitter: 'MachinisteWeb',
+      work: {
+        role: 'Cofounder',
+        org: 'Orchard ID',
+        orgUrl: 'https://www.orchard-id.com/'
+      },
+      reposPersonal: [
+        'vuejs-fr/vuejs.org', 'Haeresis/node-atlas-hello-vue'
+      ],
+      links: [
+        'https://node-atlas.js.org/', 'https://blog.lesieur.name/'
+      ]
     }
   ]