1Weather.xcodeproj · 3bc28137146a24ee64b96ca70a2c624069a0e342 · Dmitriy Stepanets / 1weather

Merge branch 'develop' into feature/IOS-72-widget · 3bc28137

# Conflicts:
#	1Weather.xcodeproj/project.pbxproj
#	1Weather.xcodeproj/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist
#	Podfile.lock
#	Pods/Manifest.lock

committed Jun 16, 2021

3bc28137

Name	Last commit	Last Update
..
project.xcworkspace		Loading commit data...
xcshareddata/xcschemes		Loading commit data...
xcuserdata/dstepanets.xcuserdatad/xcschemes		Loading commit data...
project.pbxproj		Loading commit data...
project.pbxproj.orig		Loading commit data...