Merge branch 'master' into release

jmdobry · jmdobry · commit f3a1f3510db6 · 2016-08-15T14:57:11.000-07:00
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "js-data-rethinkdb",
   "description": "RethinkDB adapter for js-data.",
-  "version": "3.0.0-beta.8",
+  "version": "3.0.0-rc.1",
   "homepage": "https://github.com/js-data/js-data-rethinkdb",
   "repository": {
     "type": "git",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "js-data-rethinkdb",`
`3`	`3`	`"description": "RethinkDB adapter for js-data.",`
`4`		`- "version": "3.0.0-beta.8",`
	`4`	`+ "version": "3.0.0-rc.1",`
`5`	`5`	`"homepage": "https://github.com/js-data/js-data-rethinkdb",`
`6`	`6`	`"repository": {`
`7`	`7`	`"type": "git",`