project.pbxproj
66.7 KB
-
Merge branch 'feature/minutely/IOS-172-minutely-cell' into release/5.4.1 · 4ae087ec# Conflicts: # 1Weather.xcodeproj/project.pbxproj # OneWeatherAnalytics/OneWeatherAnalytics/AnalyticsEvent.swift # OneWeatherCore/OneWeatherCore/Managers/WidgetManager.swift # OneWeatherCore/OneWeatherCore/Settings/Settings.swift
Demid Merzlyakov committed