Chris Bianca 7619548a2c Merge branch 'master' into fcm-rewrite ...

# Conflicts:
#	lib/modules/core/firebase.js
#	tests/ios/Podfile.lock

2018-03-08 09:32:57 +00:00

..

xcshareddata/xcschemes

[tests] upgraded tests app to latest RN, removed broken toasts module that was causing a crash on boot and switched to using prop-types module

2017-10-03 14:09:09 +01:00

project.pbxproj

Merge branch 'master' into fcm-rewrite

2018-03-08 09:32:57 +00:00