project.pbxproj
55.9 KB
-
Merge branch 'master' into forecast-controller · e8b2c07d# Conflicts: # 1Weather.xcworkspace/xcuserdata/dstepanets.xcuserdatad/UserInterfaceState.xcuserstate # 1Weather/UI/View controllers/Today/Cells/CityForecastTimePeriod/CityForecastTimePeriodCell.swift
Dmitriy Stepanets committed