# HG changeset patch
# User FLORAC Thierry <thierry.florac@onf.fr>
# Date 1574468651 -3600
# Node ID 2022e4da3ad9cf1507b699108210aa2cb9e2cf11
# Parent  5028ff294931001feb318cce5528fa5086e88365# Parent  aeea1428f7821bfd2fb57e1137b1e1d46ad14b38
Merge branch 'dev-tf-branch' into 'master'

Merge branch dev-tf

See merge request onf/support/python/pyramid/pyams/pyams-utils!3