Skip to content

K
karname-ui
Commit d9e1083d authored by Reza Sahebgharan's avatar Reza Sahebgharan
Browse files
Options

Merge branch 'master' into 'staging_hisworklist' 

# Conflicts:
#   .gitlab-ci.yml
#   docker-compose.yml
#   imports/api/collections/worklist4hislink.js
parents bceff326 2c9af4db
Pipeline #884 passed with stage
    in 15 minutes and 18 seconds