chore: merge master

Guillaume Chau · Guillaume Chau · commit c8f473b49c45 · 2018-05-13T20:29:28.000+02:00
diff --git a/README.md b/README.md
@@ -66,7 +66,7 @@ You can also use the `$subscribe(name, ...params)` method in you component code:
 
 
 ```js
-ready () {
+mounted () {
   // Subscribes to the 'threads' publication with two parameters
   this.$subscribe('thread', 'new', 10)
 }

Original file line number	Diff line number	Diff line change
@@ -66,7 +66,7 @@ You can also use the `$subscribe(name, ...params)` method in you component code:
`66`	`66`
`67`	`67`
`68`	`68`	```js
`69`		`-ready () {`
	`69`	`+mounted () {`
`70`	`70`	`// Subscribes to the 'threads' publication with two parameters`
`71`	`71`	`this.$subscribe('thread', 'new', 10)`
`72`	`72`	`}`