summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-01 17:24:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-01 17:24:42 +0000
commit7efd19e3716ab6f9146052da76d1bd59ec815f2d (patch)
treefe2d8d99e5bade0fe68fcaf7678479722fac26c8 /vendor
parenta97ccf1330bc0697e05cdac37ffd5597b6fc4eea (diff)
downloadgitlab-ce-7efd19e3716ab6f9146052da76d1bd59ec815f2d.tar.gz
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.2
Diffstat (limited to 'vendor')
-rwxr-xr-x[-rw-r--r--]vendor/gitignore/C++.gitignore0
-rwxr-xr-x[-rw-r--r--]vendor/gitignore/Java.gitignore0
2 files changed, 0 insertions, 0 deletions
diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore
index 259148fa18f..259148fa18f 100644..100755
--- a/vendor/gitignore/C++.gitignore
+++ b/vendor/gitignore/C++.gitignore
diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore
index a1c2a238a96..a1c2a238a96 100644..100755
--- a/vendor/gitignore/Java.gitignore
+++ b/vendor/gitignore/Java.gitignore