This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 9af21bd refs #6971 Rendre accessible l'ajout de calée uniquement si possible (LL) new 697deee refs #6972 FIX NPE + ajout trads new f56d065 fixes #6972: L'export d'une marée vers la base centrale échoue Merge branch 'feature/6972' into develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f56d065cbc5add2a941f1e11f933a5b75d06031e Merge: 9af21bd 697deee Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 15 19:17:28 2015 +0200 fixes #6972: L'export d'une marée vers la base centrale échoue Merge branch 'feature/6972' into develop commit 697deee579cddce8bbf5e245253f7c0db1dfb6e1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 15 19:17:21 2015 +0200 refs #6972 FIX NPE + ajout trads Summary of changes: .../src/main/java/fr/ird/observe/entities/longline/TripLonglines.java | 2 +- observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties | 4 ++-- observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties | 4 ++-- observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.