summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-18 11:39:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-18 11:39:24 +0000
commit4e718d3e348757fc786e3e5438dd6b78bf3b62fe (patch)
treef8de657546f3522dbbb26e46c8688a0183bdaf79
parent5ce5a76fc48ac167caccf14d16583f966749e5ce (diff)
downloadgitlab-ce-4e718d3e348757fc786e3e5438dd6b78bf3b62fe.tar.gz
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
-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