This is an automated email from the git hooks/post-receive script. New change to branch master in repository wao. See http://git.codelutin.com/wao.git from ff93260 Merge branch 'release/5.0-RC3' adds 52ea7b4 Dans l'onglet Navires, on ne doit pas voir les navires Scléro (testable-client #6658) adds cb06485 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds a48664a Merge branch 'master' into develop adds 09464e0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 728c958 Mise à jour de develop local après release adds 5d7bcdc Correction du tri des utilisateurs dans l'administration, on perdait les homonymes (termine #6666) adds 64f3e3d On autorise "text/plain" comme type MIME pour les fichiers CSV (termine #6664) adds cfd8f88 [jgitflow-maven-plugin]updating poms for branch '5.0-RC4' with snapshot versions adds 274da5a [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC4' with non-snapshot versions adds 29a5c2b Merge branch 'release/5.0-RC4' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../java/fr/ifremer/wao/entity/BoatTopiaDao.java | 2 ++ .../entity/SclerochronologySamplingContext.java | 16 +++++++++++++-- .../main/java/fr/ifremer/wao/entity/WaoUsers.java | 24 ++++++++++++++++++++++ wao-services/pom.xml | 2 +- .../service/administration/WaoUsersList.java | 2 +- wao-web/pom.xml | 2 +- .../wao/web/action/AbstractImportCsvAction.java | 2 +- 9 files changed, 46 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.