Merge branch 'master' into mrschmidt-fixcompile

jshcrowthe · web-flow · commit b263e6b6de31 · 2017-07-24T12:32:30.000-06:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "firebase",
-  "version": "4.1.3",
+  "version": "4.1.4",
   "description": "Firebase JavaScript library for web and Node.js",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "license": "Apache-2.0",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "firebase",`
`3`		`- "version": "4.1.3",`
	`3`	`+ "version": "4.1.4",`
`4`	`4`	`"description": "Firebase JavaScript library for web and Node.js",`
`5`	`5`	`"author": "Firebase <[email protected]> (https://firebase.google.com/)",`
`6`	`6`	`"license": "Apache-2.0",`