This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 23c79a30d8a45fb4bcba644a84011890f4c0b4ec Merge: 7cc43a1 6cb3384 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Thu Jun 16 16:50:01 2016 +0200 Merge branch 'feature/8175' into develop .../echobase/config/EchoBaseConfiguration.java | 14 +++++- .../config/EchoBaseConfigurationOption.java | 48 ++++++++++++------- .../i18n/echobase-domain_en_GB.properties | 3 ++ .../i18n/echobase-domain_fr_FR.properties | 3 ++ echobase-ui/pom.xml | 1 + .../echobase/ui/EchoBaseApplicationContext.java | 22 +++++++++ .../src/main/resources/embedded/update-echobase.sh | 54 ++++++++++++++++++++++ src/site/en/rst/install.rst.vm | 5 ++ src/site/en/rst/update.rst.vm | 33 ++----------- src/site/rst/install.rst.vm | 20 ++++---- src/site/rst/update.rst.vm | 29 ++++++++---- 11 files changed, 168 insertions(+), 64 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.