Elliot Hesp fb90f444d9 Fix merge conflict

2017-05-23 14:10:07 +01:00

..

src/main

[config] Standardize ios & android

2017-05-23 14:08:59 +01:00

.editorconfig

RNFirebase android

2017-03-02 11:30:08 +00:00

build.gradle

Fix merge conflict

2017-05-23 14:10:07 +01:00