summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/diffs/components/merge_conflict_warning.vue
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42GitLab Bot2020-12-171-3/+5
* Add latest changes from gitlab-org/gitlab@13-4-stable-eeGitLab Bot2020-09-191-0/+72