summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-02 12:55:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-02 12:55:58 +0000
commitb32aba216848624c2be974c6ba2306112855b0a7 (patch)
tree66e23f4526a1ee684762d3aef3aebc5a2c7ca339
parentcb6968910528d6752bf4ae07f36c8802cf49f728 (diff)
downloadgitlab-ce-b32aba216848624c2be974c6ba2306112855b0a7.tar.gz
Add latest changes from gitlab-org/gitlab@13-1-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