Merge remote-tracking branch 'origin/CAKE-192-implement-unstoppable-domain' into CAKE-192-implement-unstoppable-domain

# Conflicts:
#	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
This commit is contained in:
OleksandrSobol 2021-06-15 22:47:26 +03:00
commit 23e5ec1d01
2 changed files with 2 additions and 3 deletions

View file

@ -36,8 +36,8 @@ target 'Runner' do
# Cake Wallet (Legacy) # Cake Wallet (Legacy)
pod 'CryptoSwift' pod 'CryptoSwift'
pod 'Firebase/Messaging', '6.33.0'
pod 'UnstoppableDomainsResolution', '~> 0.3.6' pod 'UnstoppableDomainsResolution', '~> 0.3.6'
pod 'Firebase/Messaging', '6.33.0'
end end
post_install do |installer| post_install do |installer|

View file

@ -191,6 +191,7 @@ SPEC REPOS:
- CryptoSwift - CryptoSwift
- DKImagePickerController - DKImagePickerController
- DKPhotoGallery - DKPhotoGallery
- EthereumAddress
- Firebase - Firebase
- FirebaseCore - FirebaseCore
- FirebaseCoreDiagnostics - FirebaseCoreDiagnostics
@ -199,7 +200,6 @@ SPEC REPOS:
- FirebaseMessaging - FirebaseMessaging
- GoogleDataTransport - GoogleDataTransport
- GoogleUtilities - GoogleUtilities
- EthereumAddress
- MTBBarcodeScanner - MTBBarcodeScanner
- nanopb - nanopb
- PromisesObjC - PromisesObjC
@ -290,6 +290,5 @@ SPEC CHECKSUMS:
url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
webview_flutter: 9f491a9b5a66f2573946a389b2677987b0ff8c0b webview_flutter: 9f491a9b5a66f2573946a389b2677987b0ff8c0b
PODFILE CHECKSUM: 5b5f101b119a1b6eb857c967d462832a9062dec4
COCOAPODS: 1.10.1 COCOAPODS: 1.10.1