Merge branch 'master' into 5.6

vkarpov15 · vkarpov15 · commit ada35e5c59ab · 2019-06-13T12:08:05.000-04:00
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "5.5.15",
+  "version": "5.5.16-pre",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "mongoose",`
`3`	`3`	`"description": "Mongoose MongoDB ODM",`
`4`		`- "version": "5.5.15",`
	`4`	`+ "version": "5.5.16-pre",`
`5`	`5`	`"author": "Guillermo Rauch <[email protected]>",`
`6`	`6`	`"keywords": [`
`7`	`7`	`"mongodb",`