summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-23 19:35:49 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-23 19:35:49 +0000
commit3e714bb0029f37160b9544a3c5ed45fe1f55faab (patch)
tree6417d3f06e19ee3e36737c13fb3968da94f84a67
parent7ee903626dba129ab84619262a382d52e12cdc6c (diff)
downloadgitlab-ce-3e714bb0029f37160b9544a3c5ed45fe1f55faab.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