summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-06 00:06:13 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-06 00:06:13 +0000
commitb66baea97dfb652e8a143e409ab44bbd38c856f1 (patch)
tree28d3033719035cfe3dcd8b4e40ad193674185cc1 /vendor
parent82cef8dd1f48ffbc7aaa1ff7374cdb859137e01e (diff)
downloadgitlab-ce-b66baea97dfb652e8a143e409ab44bbd38c856f1.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