From: Gérald NICOLAS <gerald.nicolas@edf.fr>
Date: Mon, 29 Jun 2020 09:28:50 +0000 (+0200)
Subject: Merge branch 'master' into gni/adaptation
X-Git-Tag: V9_7_0a1~18^2~60
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=33ba300401554a1a58083e45c1f83b6c55f0b7c5;p=modules%2Fsmesh.git

Merge branch 'master' into gni/adaptation
---

33ba300401554a1a58083e45c1f83b6c55f0b7c5