summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-21 15:16:07 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-21 15:16:07 +0000
commit38b862eb9812bf8b703a62cce8567145b0a0fe7b (patch)
tree4a01595cecce49dd82793101b5ededa57b92ff20 /vendor
parent83d5761d5073b910383ecf0e84f0249303ce0f4e (diff)
downloadgitlab-ce-38b862eb9812bf8b703a62cce8567145b0a0fe7b.tar.gz
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc43
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