1Weather · e085a68822d516b8c6966292c3d202de3dd97fb0 · Dmitriy Stepanets / 1weather

Merge branch 'bugfix/shorts-card-color' into release/5.2

# Conflicts:
#	1Weather/UI/View controllers/Today/Shorts/ShortsCollectionViewCell.swift
#	Pods/Pods.xcodeproj/project.pbxproj
#	Pods/Target Support Files/Pods-1Weather/Pods-1Weather.debug.xcconfig
#	Pods/Target Support Files/Pods-1Weather/Pods-1Weather.release.xcconfig

committed Aug 06, 2021

e085a688

Name	Last commit	Last Update
..
Ads		Loading commit data...
Base.lproj		Loading commit data...
Common		Loading commit data...
Configuration		Loading commit data...
Coordinators		Loading commit data...
Extensions		Loading commit data...
InApps		Loading commit data...
Model		Loading commit data...
Network		Loading commit data...
Resources		Loading commit data...
Storage		Loading commit data...
UI		Loading commit data...
ViewModels		Loading commit data...
1Weather.entitlements		Loading commit data...
AppDelegate.swift		Loading commit data...
Info.plist		Loading commit data...