Skip to content

Commit 00cb964

Browse files
committed
Merge branch 'release'
Release 6.2.3
2 parents 6ef1355 + a5b5590 commit 00cb964

File tree

9 files changed

+48
-0
lines changed

9 files changed

+48
-0
lines changed

integration/browserify/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
"test": "karma start --single-run"
88
},
99
"dependencies": {
10+
<<<<<<< HEAD
1011
"firebase": "6.2.2"
12+
=======
13+
"firebase": "6.2.3"
14+
>>>>>>> release
1115
},
1216
"devDependencies": {
1317
"@babel/core": "7.4.4",

integration/firebase-typings/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
"test": "tsc index.ts --outDir dist"
77
},
88
"dependencies": {
9+
<<<<<<< HEAD
910
"firebase": "6.2.2"
11+
=======
12+
"firebase": "6.2.3"
13+
>>>>>>> release
1014
},
1115
"devDependencies": {
1216
"typescript": "3.4.5"

integration/messaging/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
"test:manual": "mocha --exit"
99
},
1010
"dependencies": {
11+
<<<<<<< HEAD
1112
"firebase": "6.2.2"
13+
=======
14+
"firebase": "6.2.3"
15+
>>>>>>> release
1216
},
1317
"devDependencies": {
1418
"chai": "4.2.0",

integration/typescript/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
"test": "karma start --single-run"
77
},
88
"dependencies": {
9+
<<<<<<< HEAD
910
"firebase": "6.2.2"
11+
=======
12+
"firebase": "6.2.3"
13+
>>>>>>> release
1014
},
1115
"devDependencies": {
1216
"@babel/core": "7.4.4",

integration/webpack/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
"test": "karma start --single-run"
88
},
99
"dependencies": {
10+
<<<<<<< HEAD
1011
"firebase": "6.2.2"
12+
=======
13+
"firebase": "6.2.3"
14+
>>>>>>> release
1115
},
1216
"devDependencies": {
1317
"@babel/core": "7.4.4",

packages/app/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@firebase/app",
3+
<<<<<<< HEAD
34
"version": "0.4.7",
5+
=======
6+
"version": "0.4.8",
7+
>>>>>>> release
48
"description": "The primary entrypoint to the Firebase JS SDK",
59
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
610
"main": "dist/index.node.cjs.js",

packages/firebase/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "firebase",
3+
<<<<<<< HEAD
34
"version": "6.2.2",
5+
=======
6+
"version": "6.2.3",
7+
>>>>>>> release
48
"description": "Firebase JavaScript library for web and Node.js",
59
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
610
"license": "Apache-2.0",
@@ -37,7 +41,11 @@
3741
"module": "dist/index.esm.js",
3842
"react-native": "dist/index.rn.cjs.js",
3943
"dependencies": {
44+
<<<<<<< HEAD
4045
"@firebase/app": "0.4.7",
46+
=======
47+
"@firebase/app": "0.4.8",
48+
>>>>>>> release
4149
"@firebase/app-types": "0.4.0",
4250
"@firebase/auth": "0.11.3",
4351
"@firebase/database": "0.4.6",

packages/rxfire/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "rxfire",
3+
<<<<<<< HEAD
34
"version": "3.6.2",
5+
=======
6+
"version": "3.6.3",
7+
>>>>>>> release
48
"private": false,
59
"description": "Firebase JavaScript library RxJS",
610
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
@@ -36,7 +40,11 @@
3640
"rxjs": "6.x.x"
3741
},
3842
"devDependencies": {
43+
<<<<<<< HEAD
3944
"firebase": "6.2.2",
45+
=======
46+
"firebase": "6.2.3",
47+
>>>>>>> release
4048
"rxjs": "^6.5.1",
4149
"rollup": "1.11.0",
4250
"rollup-plugin-commonjs": "9.3.4",

packages/testing/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@firebase/testing",
3+
<<<<<<< HEAD
34
"version": "0.11.2",
5+
=======
6+
"version": "0.11.3",
7+
>>>>>>> release
48
"description": "",
59
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
610
"main": "dist/index.cjs.js",
@@ -15,7 +19,11 @@
1519
},
1620
"license": "Apache-2.0",
1721
"dependencies": {
22+
<<<<<<< HEAD
1823
"firebase": "6.2.2",
24+
=======
25+
"firebase": "6.2.3",
26+
>>>>>>> release
1927
"@firebase/logger": "0.1.17",
2028
"@firebase/util": "0.2.20",
2129
"@types/request": "2.48.1",

0 commit comments

Comments
 (0)