summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-20 12:47:22 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-20 12:47:22 +0000
commitd8bf49ba281a48fe6d44659bedf13cfebb3101d1 (patch)
tree0635edfaf54e196877a0a2e7c2f16cfdad592cf1
parent5577b57318dfdf2a05f81aab742a5b3c421b85f2 (diff)
downloadgitlab-ce-d8bf49ba281a48fe6d44659bedf13cfebb3101d1.tar.gz
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
-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