Skip to content

M
media-resource

Merge branch 'master' into 'test' 

# Conflicts:
#   app/Http/Controllers/Api/Client/MediaController.php
2 jobs from test in 32 seconds (queued for 2 seconds)
ab41bdef ab41bdef049bdcd455233c430fc38fd607b6aae2
Status Job ID Name Coverage
  Build
passed #23785
offcn-media-resource-shell
docker-build

00:30

 
  Deploy
passed #23786
offcn-media-resource-shell
k8s-deploy

00:01