Merge branch 'develop' into modules
# Conflicts: # 1Weather.xcodeproj/project.pbxproj # 1Weather/Analytics/AppAnalytics.swift # 1Weather/AppDelegate.swift # 1Weather/Coordinators/DeeplinksRouter.swift # 1Weather/InApps/OLInAppStoreManager.swift # 1Weather/Network/PushNotificationsManager.swift # Podfile.lock # Pods/Manifest.lock # Pods/Pods.xcodeproj/project.pbxproj
Showing
File added
... | @@ -28,6 +28,7 @@ target '1Weather' do | ... | @@ -28,6 +28,7 @@ target '1Weather' do |
pod 'AlgoliaSearchClient', '~> 8.2' | pod 'AlgoliaSearchClient', '~> 8.2' | ||
pod 'Flurry-iOS-SDK/FlurrySDK' | pod 'Flurry-iOS-SDK/FlurrySDK' | ||
pod 'MoEngage-iOS-SDK' | pod 'MoEngage-iOS-SDK' | ||
pod 'AppsFlyerFramework' | |||
# Recommended: Add the Firebase pod for Google Analytics | # Recommended: Add the Firebase pod for Google Analytics | ||
pod 'Firebase/Analytics' | pod 'Firebase/Analytics' | ||
... | ... |
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
Pods/AppsFlyerFramework/LICENSE
0 → 100644
Pods/AppsFlyerFramework/README.md
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
Please
register
or
sign in
to comment