summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-21 13:42:08 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-21 13:42:08 +0000
commit83d5761d5073b910383ecf0e84f0249303ce0f4e (patch)
treef9a688ae3f6bfc23751da0b1e2548cd96882dda2
parentd940be2a6d1ee982128532a7f24c40bdacc0eff6 (diff)
downloadgitlab-ce-83d5761d5073b910383ecf0e84f0249303ce0f4e.tar.gz
Add latest changes from gitlab-org/gitlab@13-5-stable-ee
-rw-r--r--[-rwxr-xr-x]vendor/gitignore/C++.gitignore0
-rw-r--r--[-rwxr-xr-x]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 100755..100644
--- 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 100755..100644
--- a/vendor/gitignore/Java.gitignore
+++ b/vendor/gitignore/Java.gitignore