kylefang/react-native-firebase
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native-firebase.git synced 2026-04-24 12:34:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fcm-rewrite

Browse Source 
# Conflicts:
#	lib/modules/messaging/index.js
#	lib/types/index.js
#	tests/ios/Podfile.lock
This commit is contained in:
Chris Bianca
2018-02-14 15:28:15 +00:00
parent 665cd1a277 5356b949d7
commit 804a8e4c65
52 changed files with 833 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/modules/core/firebase.js
View File

@@ -6,7 +6,7 @@ import { NativeModules } from 'react-native';
import APPS from '../../utils/apps';
import INTERNALS from '../../utils/internals';
import App from './firebase-app';
import App from './app';
import VERSION from '../../version';
// module imports