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 948ebc04f6534814b687bf5ad5a53f6dd669281b Merge: e8e306e 35044bc Author: David Cossé <cosse@codelutin.com> Date: Fri Dec 23 16:32:21 2016 +0100 Merge branch 'feature/1377-Amélioration_import_export_tous' into develop .../org/chorem/lima/enums/ImportExportEnum.java | 6 ++--- .../chorem/lima/ui/importexport/ImportExport.java | 30 +++++++++++++++++++--- .../org/chorem/lima/ui/opening/BackupPanel.jaxx | 1 + .../chorem/lima/ui/opening/BackupPanelHandler.java | 3 ++- .../chorem/lima/ui/opening/OpeningViewHandler.java | 8 ++++++ .../resources/i18n/lima-swing_en_GB.properties | 16 ++++++++++-- .../resources/i18n/lima-swing_fr_FR.properties | 16 ++++++++++-- 7 files changed, 68 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.