summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-12 18:07:54 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-12 18:07:54 +0000
commit742a7f35acd8cf2150bf322e4b385ea104d74a05 (patch)
tree3ca173ce1fa5549f49bc41fc9c52142d616bd943 /vendor
parent8ff63012e9b7e3dc2279e636868af9a438d1fa93 (diff)
downloadgitlab-ce-742a7f35acd8cf2150bf322e4b385ea104d74a05.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