XcodeProj: Remove Conflicts
Related merge request !1346 to merge supportForFolders
latest
merge request
4 jobs
2 minutes 57 seconds, queued for 1 seconds
VideoLAN code repository instance