Commit 82667cf1 authored by Reza Sahebgharan's avatar Reza Sahebgharan

Merge branch 'master' into 'staging.hisworklist'

# Conflicts:
#   .gitlab-ci.yml
parents 93e6f86f d6b595a7
Pipeline #923 passed with stage