Commit Graph

5 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
Salakar ac258681bc 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-11 17:37:12 +01:00
Chris Bianca 97cc5ee131 [ios] Fix conditional imports 2017-08-11 16:07:39 +01:00
Chris Bianca a785b050db [database][ios][wip] Replicate Android changes on iOS 2017-08-02 16:51:57 +01:00
Chris Bianca 4a7a7574db [ios] Break modules into subfolders 2017-06-16 11:15:42 +01:00