Commit Graph

6 Commits

Author SHA1 Message Date
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
Salakar 282f953f52 [both] continued work on multi app support - storage now full supported and auth WIP 2017-07-12 15:49:33 +01:00
nico 1f61933d65 removed newline 2017-06-29 18:27:47 +02:00
nico d77dd094db fixed ios custom metaData 2017-06-29 18:12:57 +02:00
Chris Bianca 4a7a7574db [ios] Break modules into subfolders 2017-06-16 11:15:42 +01:00