This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git commit 5d0f879fdeac4873be6435f00b5729651bc0cb04 Merge: e7a4526 d9d7218 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Nov 3 17:25:23 2015 +0100 Champ résiduel issu de la traduction FR->EN (termine #7671) Merge branch 'feature/7671' into develop-4.x .../fr/ird/observe/report/model/ReportExecute.java | 3 ++ .../src/test/resources/db/4.0.4/referentiel.sql.gz | Bin 0 -> 138244 bytes .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_4_0_4.java | 48 +++++++++++++++++++++ .../4.0.4/remove-trip-datearriveeport-field-H2.sql | 23 ++++++++++ .../4.0.4/remove-trip-datearriveeport-field-PG.sql | 23 ++++++++++ .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- observe-entities/src/main/xmi/observe-seine.zargo | Bin 85905 -> 85857 bytes 10 files changed, 103 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.