summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessio Caiazza <acaiazza@gitlab.com>2019-12-30 14:22:06 +0100
committerAlessio Caiazza <acaiazza@gitlab.com>2019-12-30 14:22:06 +0100
commit5bc8aa03f1ac7ff5a20ae77e8f62631370a52d1a (patch)
tree1b530dff697604982ad58b1bfacd76965a731f30
parentf11adf549084bda61fbbb8e3e6a84504173d3739 (diff)
parent4498fdb900207cf0de0a9138f6753cb484924d1b (diff)
downloadgitlab-ce-5bc8aa03f1ac7ff5a20ae77e8f62631370a52d1a.tar.gz
Merge remote-tracking branch 'security/12-6-stable' into 12-6-stable
This merge is needed because of a race between FOSS merge on canonical and security. Details on https://gitlab.com/gitlab-org/release-tools/issues/358
0 files changed, 0 insertions, 0 deletions