summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-13 15:06:04 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-13 15:06:04 +0000
commit5939b09fd3db37ec98dfce0345162617d9d1d313 (patch)
treee1ac9f6228eb993929d468ff8b954a0abf54d9e8 /vendor
parentb7dfe2ae4054aa40e15182fd3c6cb7dd39f131db (diff)
downloadgitlab-ce-5939b09fd3db37ec98dfce0345162617d9d1d313.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