# HG changeset patch
# User FLORAC Thierry <thierry.florac@onf.fr>
# Date 1574275226 -3600
# Node ID d69d9c919448c37c9f92735d6de8e879d992226f
# Parent  3f249488b3ffa6d9c4f0c1c789a4c0764eecc9ae# Parent  0037199881fb69d5191402f5c42837e61a83be23
Merge branch 'dev-tf-branch' into 'master'

Merge dev-tf

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