diff options
| author | Yorick Peterse <yorick@yorickpeterse.com> | 2020-02-20 15:01:06 +0100 |
|---|---|---|
| committer | Yorick Peterse <yorick@yorickpeterse.com> | 2020-02-20 15:01:06 +0100 |
| commit | 04124f5f847f9c33ce8edaae5fd33e37570e0fea (patch) | |
| tree | 9eaed34ab1e71fb6166f713fd403aab8b7d622e8 | |
| parent | dafe04b7ba600330adf588b83c588f3b09b77968 (diff) | |
| parent | a4d06b45ba1c04275cc7242434747788dc293bbd (diff) | |
| download | gitlab-ce-04124f5f847f9c33ce8edaae5fd33e37570e0fea.tar.gz | |
Merge public 12-6-stable into security 12-6-stable
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/C++.gitignore | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/Java.gitignore | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore index 259148fa18f..259148fa18f 100755..100644 --- 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 100755..100644 --- a/vendor/gitignore/Java.gitignore +++ b/vendor/gitignore/Java.gitignore |