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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment