This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 270aa576037041815b506fad53e8b6fdfae806c5 Merge: e72c6d7 8564b8f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Nov 6 15:24:14 2015 +0100 Merge branch 'feature/7679' into develop .../java/fr/ird/observe/ui/admin/AdminStep.java | 3 +- .../ui/admin/consolidate/ConsolidateModel.java | 45 ------ .../ui/admin/consolidate/ConsolidateUIHandler.java | 159 +++++++++------------ .../observe-application-swing_en_GB.properties | 3 + .../observe-application-swing_es_ES.properties | 3 + .../observe-application-swing_fr_FR.properties | 3 + .../consolidate/ConsolidateDataService.java | 2 + .../java/fr/ird/observe/services/dto/IdDtos.java | 20 +++ .../services/ObserveServiceFactoryRest.java | 7 + .../service/seine/NonTargetCatchServiceTopia.java | 4 +- 10 files changed, 109 insertions(+), 140 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.