Commit Graph

1 Commits

Author SHA1 Message Date
Salakar 0675aa076d Merge branch 'master' of https://github.com/invertase/react-native-firebase into v3
# Conflicts:
#	ios/RNFirebase/admob/RNFirebaseAdMob.m
#	ios/RNFirebase/database/RNFirebaseDatabase.h
#	ios/RNFirebase/database/RNFirebaseDatabaseReference.m
#	lib/modules/admob/index.js
#	tests/ios/Podfile.lock
2017-08-12 19:07:51 +01:00