diff --git a/src/v2/guide/mixins.md b/src/v2/guide/mixins.md index 73c4f7dcf3..624feb827c 100644 --- a/src/v2/guide/mixins.md +++ b/src/v2/guide/mixins.md @@ -8,6 +8,8 @@ order: 301 Mixins are a flexible way to distribute reusable functionalities for Vue components. A mixin object can contain any component options. When a component uses a mixin, all options in the mixin will be "mixed" into the component's own options. +
Watch a video explanation on Vue Mastery
+ Example: ``` js diff --git a/src/v2/guide/team.md b/src/v2/guide/team.md index 0972932ce8..327b2217d1 100644 --- a/src/v2/guide/team.md +++ b/src/v2/guide/team.md @@ -1159,6 +1159,40 @@ order: 803 'https://vuestorefront.io' ] }, + { + name: 'Gregg Pollack', + title: '', + city: 'Orlando, FL', + languages: ['en'], + github: 'gregg', + twitter: 'greggpollack', + work: { + role: 'Vue Instructor', + org: 'Vue Mastery', + orgUrl: 'https://www.vuemastery.com/' + }, + links: [ + 'https://www.vuemastery.com', + 'https://news.vuejs.org/' + ] + }, + { + name: 'Adam Jahr', + title: '', + city: 'Orlando, FL', + languages: ['en'], + github: 'atomjar', + twitter: 'adamjahr', + work: { + role: 'Vue Instructor', + org: 'Vue Mastery', + orgUrl: 'https://www.vuemastery.com/' + }, + links: [ + 'https://www.vuemastery.com', + 'https://news.vuejs.org/' + ] + } ] Vue.component('vuer-profile', {