# HG changeset patch
# User Thierry Florac <tflorac@ulthar.net>
# Date 1574759858 -3600
# Node ID c8b8b126bb32fc2998a7979061298f74b080233d
# Parent  4b0f521af8ad8ab2cd64a2774b29480646996852# Parent  63284c98cdc1b9bb7a781984eec6d7d40bbe8a05
Merge branch dev-tf

diff -r 4b0f521af8ad -r c8b8b126bb32 .gitlab-ci.yml
diff -r 4b0f521af8ad -r c8b8b126bb32 buildout.cfg