-
Merge branch 'feature/IOS-72-widget-production' into feature/IOS-123-widget-promotion-sheet · b26134a8
# Conflicts: # 1Weather.xcodeproj/project.pbxproj # 1Weather.xcworkspace/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist # 1Weather/Resources/en.lproj/Localizable.strings # Podfile.lock # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/Info.plist # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/ios-arm64_armv7/AppsFlyerLib.framework/AppsFlyerLib # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/ios-arm64_armv7/AppsFlyerLib.framework/Headers/AppsFlyerLib.h # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/ios-arm64_armv7/AppsFlyerLib.framework/Info.plist # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/ios-arm64_i386_x86_64-simulator/AppsFlyerLib.framework/AppsFlyerLib # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/ios-arm64_i386_x86_64-simulator/AppsFlyerLib.framework/Headers/AppsFlyerLib.h # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/ios-arm64_i386_x86_64-simulator/AppsFlyerLib.framework/Info.plist # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/ios-arm64_i386_x86_64-simulator/AppsFlyerLib.framework/_CodeSignature/CodeDirectory # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/ios-arm64_i386_x86_64-simulator/AppsFlyerLib.framework/_CodeSignature/CodeRequirements-1 # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/ios-arm64_i386_x86_64-simulator/AppsFlyerLib.framework/_CodeSignature/CodeResources # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/ios-arm64_x86_64-maccatalyst/AppsFlyerLib.framework/Versions/A/AppsFlyerLib # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/ios-arm64_x86_64-maccatalyst/AppsFlyerLib.framework/Versions/A/Headers/AppsFlyerLib.h # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/ios-arm64_x86_64-maccatalyst/AppsFlyerLib.framework/Versions/A/Resources/Info.plist # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/macos-arm64_x86_64/AppsFlyerLib.framework/Versions/A/AppsFlyerLib # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/macos-arm64_x86_64/AppsFlyerLib.framework/Versions/A/Headers/AppsFlyerLib.h # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/macos-arm64_x86_64/AppsFlyerLib.framework/Versions/A/Resources/Info.plist # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/tvos-arm64/AppsFlyerLib.framework/AppsFlyerLib # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/tvos-arm64/AppsFlyerLib.framework/Headers/AppsFlyerLib.h # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/tvos-arm64/AppsFlyerLib.framework/Info.plist # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/tvos-arm64_x86_64-simulator/AppsFlyerLib.framework/AppsFlyerLib # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/tvos-arm64_x86_64-simulator/AppsFlyerLib.framework/Headers/AppsFlyerLib.h # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/tvos-arm64_x86_64-simulator/AppsFlyerLib.framework/Info.plist # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/tvos-arm64_x86_64-simulator/AppsFlyerLib.framework/_CodeSignature/CodeDirectory # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/tvos-arm64_x86_64-simulator/AppsFlyerLib.framework/_CodeSignature/CodeRequirements-1 # Pods/AppsFlyerFramework/AppsFlyerLib.xcframework/tvos-arm64_x86_64-simulator/AppsFlyerLib.framework/_CodeSignature/CodeResources # Pods/Manifest.lock # Pods/Pods.xcodeproj/project.pbxproj # Pods/Target Support Files/FirebaseABTesting/FirebaseABTesting-Info.plist # Pods/Target Support Files/FirebaseCore/FirebaseCore-Info.plist # Pods/Target Support Files/FirebaseCore/FirebaseCore.debug.xcconfig # Pods/Target Support Files/FirebaseCore/FirebaseCore.release.xcconfig # Pods/Target Support Files/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics-Info.plist # Pods/Target Support Files/FirebaseCrashlytics/FirebaseCrashlytics-Info.plist # Pods/Target Support Files/FirebaseInstallations/FirebaseInstallations-Info.plist # Pods/Target Support Files/FirebaseRemoteConfig/FirebaseRemoteConfig-Info.plist # Pods/Target Support Files/Pods-1Weather/Pods-1Weather.debug.xcconfig # Pods/Target Support Files/Pods-1Weather/Pods-1Weather.release.xcconfig
Dmitriy Stepanets committed
Name |
Last commit
|
Last Update |
---|---|---|
1Weather | Loading commit data... | |
1Weather.xcodeproj | Loading commit data... | |
1Weather.xcworkspace | Loading commit data... | |
BlendFIPS | Loading commit data... | |
BlendHealthSource | Loading commit data... | |
CoreDataStorage | Loading commit data... | |
DelayedSaveStorage | Loading commit data... | |
External/PSMLocationSDK/PSMLocationSDK.xcframework | Loading commit data... | |
Icons | Loading commit data... | |
OneWeatherAnalytics | Loading commit data... | |
OneWeatherCore | Loading commit data... | |
OneWeatherCorePlayground.playground | Loading commit data... | |
OneWeatherNotificationServiceExtension | Loading commit data... | |
OneWeatherWidget | Loading commit data... | |
PG.playground | Loading commit data... | |
Pods | Loading commit data... | |
WDTWeatherSource | Loading commit data... | |
scripts | Loading commit data... | |
.gitignore | Loading commit data... | |
1Weather-Icons.sketch | Loading commit data... | |
OneWeatherWidgetExtension.entitlements | Loading commit data... | |
Podfile | Loading commit data... |