This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from f48e786 Merge branch 'release/3.11' adds d26b8d1 [jgitflow-maven-plugin]updating poms for 3.12-SNAPSHOT development adds 50ef408 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds be84c4b Merge branch 'master' into develop adds 876198c [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds f177807 fixes #6377: Impossible d'ajouter une caractéristique de type qualitative (onglet observations individuelles) dans le protocole adds c0a931e fixes #6378: [CAPTURE] erreur import fichier trait adds 7ab9261 fixes #5738: [TECH] faire en sorte que les messages d'erreur reste DEVANT afin de pouvoir les consulter adds 9120049 fix i18n adds 727ac54 fixes #6379: [ERGO] Utilisation du nouveau logo adds ea75524 fixes #5738: [TECH] faire en sorte que les messages d'erreur reste DEVANT afin de pouvoir les consulter adds a2aa7fa [jgitflow-maven-plugin]updating poms for branch '3.11.1' with snapshot versions adds 0f44572 [jgitflow-maven-plugin]updating poms for branch'release/3.11.1' with non-snapshot versions adds 8d28cba Merge branch 'release/3.11.1' No new revisions were added by this update. Summary of changes: pom.xml | 4 ++-- src/site/resources/allegro_about.png | Bin 0 -> 99605 bytes src/site/site_fr.xml | 1 + tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../operationimport/ImportFromColumnFileModel.java | 4 +--- tutti-ui-swing/pom.xml | 2 +- .../CreateIndividualObservationBatchUIHandler.java | 6 +++--- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 ++-- .../src/main/resources/icons/allegro_about.png | Bin 7671 -> 99605 bytes 11 files changed, 13 insertions(+), 14 deletions(-) create mode 100644 src/site/resources/allegro_about.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.