project.pbxproj
124 KB
-
Merge branch 'feature/IOS-73-native-ads' into develop · b2cede04# Conflicts: # 1Weather.xcodeproj/project.pbxproj # 1Weather/Ads/Configuration/AdConfig.swift # 1Weather/Ads/Configuration/AdConfigManager.swift
Demid Merzlyakov committed