Commit cf108ca1 by Trịnh Hoàng Phúc

Merge branch 'master' into 'feature/design_template_ven_job'

# Conflicts:
#   Gemfile.lock
parents 541f0c93 feea628f
Pipeline #556 failed with stages
in 0 seconds