summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-20 18:52:33 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-20 18:52:33 +0000
commit5766bfc446ebf1134b2f2caff14144c74547db7c (patch)
tree453d541fc7b70cfe14d865eaf15c982840ec2efa /vendor
parent6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (diff)
downloadgitlab-ce-5766bfc446ebf1134b2f2caff14144c74547db7c.tar.gz
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
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