OleksandrSobol 251d6ad502 Merge branch 'main' into CAKE-192-implement-unstoppable-domain ... # Conflicts: # android/app/src/main/java/com/cakewallet/cake_wallet/MainActivity.java # ios/Runner/AppDelegate.swift # res/values/strings_de.arb # res/values/strings_en.arb # res/values/strings_es.arb # res/values/strings_hi.arb # res/values/strings_ja.arb # res/values/strings_ko.arb # res/values/strings_nl.arb # res/values/strings_pl.arb # res/values/strings_pt.arb # res/values/strings_ru.arb # res/values/strings_uk.arb # res/values/strings_zh.arb		2021-05-24 19:09:43 +03:00
..
java/com/cakewallet/cake_wallet	Merge branch 'main' into CAKE-192-implement-unstoppable-domain	2021-05-24 19:09:43 +03:00
res	CAKE-317 | changed ic_launcher.png in the drawable directory	2021-05-04 21:45:43 +03:00
AndroidManifest.xml	CAKE-279 | canceled changes in AndroidManifest.xml and MainActivity.java; added static constants to wyre_service.dart; moved WyreException class into own file; imported WyreService by di.dart	2021-03-23 20:57:20 +02:00