Marcos Rodriguez Vélez a94f571cf6 Merge branch 'master' of github.com:BlueWallet/BlueWallet into bugfixes ... # Conflicts: # android/app/app.iml # android/app/build.gradle # android/app/src/main/java/com/bluewallet/MainApplication.java # android/app/src/main/java/io/bluewallet/bluewallet/MainApplication.java # android/gradle/wrapper/gradle-wrapper.properties # ios/BlueWallet.xcodeproj/project.pbxproj		2019-01-21 08:51:45 -05:00
..
app	Merge branch 'master' of github.com:BlueWallet/BlueWallet into bugfixes	2019-01-21 08:51:45 -05:00
gradle/wrapper	REF: lapp-browser; OPS: build refactor	2019-01-21 13:21:48 +00:00
keystores	OPS: android build	2019-01-12 02:22:38 +00:00
metadata/en-US	REL	2019-01-05 17:47:47 +00:00
android.iml	Eject (#126)	2018-12-11 22:52:46 +00:00
BlueWallet.iml	Eject (#126)	2018-12-11 22:52:46 +00:00
build.gradle	Merge branch 'master' of github.com:BlueWallet/BlueWallet into bugfixes	2019-01-21 08:51:45 -05:00
build.sh	resolved conflict	2018-12-24 21:25:09 +00:00
gradle.properties	Eject (#126)	2018-12-11 22:52:46 +00:00
gradlew	Eject (#126)	2018-12-11 22:52:46 +00:00
gradlew.bat	Eject (#126)	2018-12-11 22:52:46 +00:00
sentry.properties	resolved conflict after reverting 6cebdebf01	2019-01-10 15:04:16 +00:00
settings.gradle	Merge branch 'master' of github.com:BlueWallet/BlueWallet into bugfixes	2019-01-21 08:51:45 -05:00
upload.sh	resolved conflict	2018-12-24 21:25:09 +00:00