This is an automated email from the git hooks/post-receive script. New commit to branch master in repository nuiton-config. See https://gitlab.nuiton.org/nuiton/nuiton-config.git commit b93b284b22454f76454f26af52ce127487fa8a6c Merge: ed40d63 37a62f4 Author: Éric <chatellier@codelutin.com> Date: Mon Aug 24 20:08:37 2020 +0200 Merge branch 'release/3.5' .gitlab-ci.yml | 51 ++++++++++++++ nuiton-config-example/pom.xml | 7 +- .../src/main/config/NuitonConfigExample.ini | 8 ++- .../nuiton/config/example/NuitonConfigTest.java | 41 +++++++++++ nuiton-config-io-ini/pom.xml | 2 +- nuiton-config-maven-plugin/pom.xml | 7 +- .../src/license/THIRD-PARTY.properties | 9 +-- .../config/plugin/io/ConfigModelIOIniImpl.java | 3 +- .../config/plugin/io/ConfigModelIOTomlImpl.java | 3 +- .../config/plugin/io/ConfigModelIOYamlImpl.java | 3 +- .../templates/ApplicationConfigTransformer.java | 14 +++- nuiton-config/pom.xml | 2 +- .../java/org/nuiton/config/ApplicationConfig.java | 7 +- pom.xml | 82 ++++++++++++++-------- src/site/site_fr.xml | 14 +--- 15 files changed, 193 insertions(+), 60 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.