LocalConfig.plist
4.3 KB
-
Merge branch 'feature/IOS-127/tercept_sdk_integration' into develop · 52c14f88# Conflicts: # 1Weather.xcodeproj/project.pbxproj # 1Weather/AppDelegate.swift # 1Weather/Network/Configuration/ConfigManager.swift # CoreDataStorage/CoreDataStorage.xcodeproj/project.pbxproj
Demid Merzlyakov committed