IOS migration Conflicts: .gitignore .gitmodules linphone-Info.plist linphone.xcodeproj/project.pbxproj submodules/build/builder-iphone-os.mk submodules/build/iphone-config.site submodules/externals/osip submodules/liblinphone.xcodeproj/project.pbxproj submodules/linphone