1Weather/Model/ModelObjects · e6ea1f92589be3fd8bd8dded49da59b1ae92a982 · Dmitriy Stepanets / 1weather

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

committed Mar 30, 2021

067721e2

Name	Last commit	Last Update
..
CurrentWeather.swift		Loading commit data...
DailyWeather.swift		Loading commit data...
DayTimeWeather.swift		Loading commit data...
GeoNamesPlace.swift		Loading commit data...
HourlyWeather.swift		Loading commit data...
Location.swift		Loading commit data...