# HG changeset patch
# User FLORAC Thierry <thierry.florac@onf.fr>
# Date 1574465924 -3600
# Node ID 5028ff294931001feb318cce5528fa5086e88365
# Parent  d69d9c919448c37c9f92735d6de8e879d992226f# Parent  0ef63dbfecd19c1d721c27b4fadefd4c78a4c9cb
Merge branch 'dev-tf-branch' into 'master'

Merge branche dev-tf

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