This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 4b07a845de7fb4603155aff20c750356e0097baa Merge: 2d199d9 eaebd84 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 5 18:01:27 2016 +0100 Fixes #7846. o remplacement des taxons obsolètes lors du chargement du protocol o remplacement des taxons obsolètes lors de l'import du protocol Merge branch 'feature/7846_import_generique_et_taxon_obsoletes' into develop .../tutti/persistence/TuttiPersistenceImpl.java | 4 +++ .../entities/protocol/TuttiProtocols.java | 4 +++ ...enericFormatReferentialSpeciesImportResult.java | 38 ++++++++++------------ .../ImportReferentialSpeciesAction.java | 2 +- .../content/home/actions/ImportProtocolAction.java | 3 ++ 5 files changed, 29 insertions(+), 22 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.