erickclark 078aede7f4 Merge branch 'master' of https://gitlab.com/aretherecookies/ui-mobile ... # Conflicts: # android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png # android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png # android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png # android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png # android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png # android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png		2018-12-01 11:54:08 -06:00
..
app	Merge branch 'master' of https://gitlab.com/aretherecookies/ui-mobile	2018-12-01 11:54:08 -06:00
gradle/wrapper	get the build working	2018-12-01 11:04:53 -06:00
keystores	upgrading the android and ios projects	2018-11-10 12:35:21 -06:00
build.gradle	get the build working	2018-12-01 11:04:53 -06:00
gradle.properties	react-native upgrade 57.5	2018-11-24 17:32:19 -06:00
gradlew	react-native upgrade 57.5	2018-11-24 17:32:19 -06:00
gradlew.bat	react-native upgrade 57.5	2018-11-24 17:32:19 -06:00
react-native-image-resizer.build.gradle	get the build working	2018-12-01 11:04:53 -06:00
settings.gradle	get the build working	2018-12-01 11:04:53 -06:00