cake_wallet/res/values
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
..
strings_de.arb Merge branch 'main' into CAKE-192-implement-unstoppable-domain 2021-06-15 13:18:52 +03:00
strings_en.arb Merge branch 'main' into CAKE-192-implement-unstoppable-domain 2021-06-15 13:18:52 +03:00
strings_es.arb Merge branch 'main' into CAKE-192-implement-unstoppable-domain 2021-06-15 13:18:52 +03:00
strings_hi.arb Merge branch 'main' into CAKE-192-implement-unstoppable-domain 2021-06-15 13:18:52 +03:00
strings_hr.arb Merge branch 'main' into CAKE-192-implement-unstoppable-domain 2021-06-15 13:18:52 +03:00
strings_it.arb Merge branch 'main' into CAKE-192-implement-unstoppable-domain 2021-06-15 13:18:52 +03:00
strings_ja.arb Merge branch 'main' into CAKE-192-implement-unstoppable-domain 2021-06-15 13:18:52 +03:00
strings_ko.arb Merge branch 'main' into CAKE-192-implement-unstoppable-domain 2021-06-15 13:18:52 +03:00
strings_nl.arb Merge branch 'main' into CAKE-192-implement-unstoppable-domain 2021-06-15 13:18:52 +03:00
strings_pl.arb Merge branch 'main' into CAKE-192-implement-unstoppable-domain 2021-06-15 13:18:52 +03:00
strings_pt.arb Merge branch 'main' into CAKE-192-implement-unstoppable-domain 2021-06-15 13:18:52 +03:00
strings_ru.arb Merge branch 'main' into CAKE-192-implement-unstoppable-domain 2021-06-15 13:18:52 +03:00
strings_uk.arb Merge branch 'main' into CAKE-192-implement-unstoppable-domain 2021-06-15 13:18:52 +03:00
strings_zh.arb Merge branch 'main' into CAKE-192-implement-unstoppable-domain 2021-06-15 13:18:52 +03:00