Salome HOME
Merge branch 'spns/20216' of https://codev-tuleap.cea.fr/plugins/git/salome/sat_salom...
authorSALOME support <support-salome@cea.fr>
Thu, 9 Sep 2021 08:14:01 +0000 (10:14 +0200)
committerSALOME support <support-salome@cea.fr>
Thu, 9 Sep 2021 08:14:01 +0000 (10:14 +0200)
commitdc1a479a1df39203fe04f79391f018b112952009
tree7ce1c18019f30f77a35820cb9fbb6c30bddcdcd1
parent33441aaf0610214cd2529379a9591f376eaff802
parent1b076f72921e72f33abf78b4e457391607ac63f1
Merge branch 'spns/20216' of https://codev-tuleap.cea.fr/plugins/git/salome/sat_salome into spns/20216

Conflicts:
products/CONFIGURATION.pyconf
products/cmake.pyconf
products/petsc.pyconf
products/CONFIGURATION.pyconf
products/cmake.pyconf