summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-13 17:07:23 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-13 17:07:23 +0000
commit8ce0cca079f01a7a0ca1061e6d3a0d87220e4713 (patch)
treec44d8ffe40472519295475bec65f22929288cbbe
parent5e4935b4d4d7ca7c176dddf9504dd13fed3bb7a8 (diff)
downloadgitlab-ce-8ce0cca079f01a7a0ca1061e6d3a0d87220e4713.tar.gz
Add latest changes from gitlab-org/gitlab@12-9-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