project.pbxproj.orig
142 KB
-
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
Demid Merzlyakov committed