summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-29 00:07:44 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-29 00:07:44 +0000
commite56fd471503e00167ca96e7792f75a0d1f3b7891 (patch)
tree87b8b69ea03c78beb5be85c5080c73f601ecc718 /vendor
parent8831c2df7fa3f1bb567e284e4b8c0a4f441e74b3 (diff)
downloadgitlab-ce-e56fd471503e00167ca96e7792f75a0d1f3b7891.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