Manifest.lock
5.55 KB
-
Merge branch 'master' into tmp/search · 067721e2# Conflicts: # 1Weather.xcodeproj/project.pbxproj # 1Weather/Resources/en.lproj/Localizable.strings # 1Weather/UI/Helpers/ThemeManager.swift # 1Weather/ViewModels/TodayViewModel.swift # Pods/Pods.xcodeproj/project.pbxproj
Dmitriy Stepanets committed