# HG changeset patch
# User FLORAC Thierry <thierry.florac@onf.fr>
# Date 1574517444 -3600
# Node ID 5a9cfa277ee7e4b21f1d32dcddcf6a8d8724cd22
# Parent  2022e4da3ad9cf1507b699108210aa2cb9e2cf11# Parent  63284c98cdc1b9bb7a781984eec6d7d40bbe8a05
Merge branch 'dev-tf-branch' into 'master'

Merge branch dev-tf

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