From: SALOME support <support-salome@cea.fr>
Date: Thu, 9 Sep 2021 08:33:17 +0000 (+0200)
Subject: Merge branch 'spns/20216' of https://codev-tuleap.cea.fr/plugins/git/salome/sat_salom... 
X-Git-Tag: V9_8_0~99
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=238ee1f35e010cb31db694dab8bfebe43668a375;p=tools%2Fsat_salome.git

Merge branch 'spns/20216' of https://codev-tuleap.cea.fr/plugins/git/salome/sat_salome into spns/20216

Conflicts:
	products/CONFIGURATION.pyconf
---

238ee1f35e010cb31db694dab8bfebe43668a375