summaryrefslogtreecommitdiff
path: root/tmp
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2020-07-23 11:01:47 +0000
committerCan Eldem <celdem@gitlab.com>2020-07-23 11:01:47 +0000
commit8ee0824204c0e97d97ad6d38778cd9e7e9da6813 (patch)
treed851d65d729ecdffd018c79c6f5d887a1e506bce /tmp
parentca675527b53c2a8316c962ee1a17bc1ee1c0c156 (diff)
parentdfa59682cfe6cc3726c321236b1e0db5e965e722 (diff)
Merge branch 'offline-tests' into 'master'v3.19.2
Combine default/custom x509 certificates in TLS validation See merge request gitlab-org/security-products/license-management!194
Diffstat (limited to 'tmp')
0 files changed, 0 insertions, 0 deletions