summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorJames Lopez <james@gitlab.com>2018-03-07 14:52:29 +0000
committerJames Lopez <james@gitlab.com>2018-03-07 14:52:29 +0000
commit2fcf779cff589b2e47feb5ea8df8afeba10a6717 (patch)
tree52024c190b073d003e588a98c1296aeac2cd5022 /lib/api
parent0f72475713dfdc5f89e2f5f8a8bbcc72f596e3f8 (diff)
parent6deed66eda567d572c31bcbf5c6a3fcda8301cee (diff)
downloadgitlab-ce-2fcf779cff589b2e47feb5ea8df8afeba10a6717.tar.gz
Merge branch 'sh-fix-otp-backup-cherry-pick' into 'master'
Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'master' See merge request gitlab/gitlabhq!2349
Diffstat (limited to 'lib/api')
0 files changed, 0 insertions, 0 deletions