Skip to content

M
media-resource

Merge branch 'master' into 'test' 

# Conflicts:
#   app/Http/Controllers/Api/MediaController.php
#   app/Model/MediaModel.php
2 jobs from test in 1 minute 3 seconds (queued for 2 seconds)
b811f2fc b811f2fce63a898386c2e4d5d49dede391e5f949
Status Job ID Name Coverage
  Build
passed #45719
offcn-media-resource-shell
docker-build

01:01

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

00:02