summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-21 13:35:02 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-21 13:35:02 +0000
commitd940be2a6d1ee982128532a7f24c40bdacc0eff6 (patch)
tree4a01595cecce49dd82793101b5ededa57b92ff20
parent815706df4c4c0601d0adf9a038ad8db94d637097 (diff)
downloadgitlab-ce-d940be2a6d1ee982128532a7f24c40bdacc0eff6.tar.gz
Add latest changes from gitlab-org/gitlab@13-5-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