OleksandrSobol 37f326e21f Merge branch 'main' into CAKE-192-implement-unstoppable-domain ... # Conflicts: # android/app/build.gradle # android/build.gradle # ios/Podfile # ios/Podfile.lock # res/values/strings_de.arb # res/values/strings_en.arb # res/values/strings_es.arb # res/values/strings_hi.arb # res/values/strings_hr.arb # res/values/strings_it.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-06-15 13:18:52 +03:00
..
java/com/cakewallet/cake_wallet	Merge branch 'main' into CAKE-192-implement-unstoppable-domain	2021-06-15 13:18:52 +03:00
res	CAKE-317 | changed ic_launcher.png in the drawable directory	2021-05-04 21:45:43 +03:00
AndroidManifest.xml	Added push notifications, FCM.	2021-06-04 18:25:17 +03:00