summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-23 00:08:30 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-23 00:08:30 +0000
commite6dd804c902b030e2178be0c9ec5c38b58bd2b14 (patch)
tree9cabaea51989befe4d8c2e65ebac11afdd5dc493 /vendor
parente5356e229f5a1181d1a49091d6dc611db68bfffb (diff)
downloadgitlab-ce-e6dd804c902b030e2178be0c9ec5c38b58bd2b14.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'vendor')
-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