project.pbxproj
149 KB
-
Merge commit 'e38fdf8f' into feature/IOS-123-widget-promotion-sheet · e5533185# Conflicts: # 1Weather.xcodeproj/project.pbxproj # 1Weather/Resources/en.lproj/Localizable.strings # OneWeatherUI/OneWeatherUI/Widgets/SmallTemperatureWidgetView.swift # OneWeatherWidget/ViewModels/ForecastWidgetViewModel.swift # Podfile # Podfile.lock # Pods/Manifest.lock # Pods/Pods.xcodeproj/project.pbxproj
Dmitriy Stepanets committed