This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit e8e306e9774ddd0fc19b2602c3d0192e2f411218 Merge: a7e4627 125f89c Author: David Cossé <cosse@codelutin.com> Date: Fri Dec 23 15:42:21 2016 +0100 Merge branch 'feature/1375-Ne_pas_interrompre_export' into develop .../chorem/lima/business/api/ExportService.java | 2 +- .../chorem/lima/business/api/ImportService.java | 2 +- .../lima/business/ejb/ExportServiceImpl.java | 157 +++++++++------------ .../lima/business/ejb/ImportServiceImpl.java | 2 +- .../lima/business/ImportExportServiceTest.java | 14 +- .../chorem/lima/ui/importexport/ImportExport.java | 96 +++++++------ 6 files changed, 126 insertions(+), 147 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.