This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git from f22e08a8 Merge remote-tracking branch 'origin/develop' into develop new c8767165 refs #1373 récuppération de modifications écrasées The 1 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 c8767165cb15423b6e5488904d81823a55e6677e Author: David Cossé <cosse@codelutin.com> Date: Sat Oct 14 01:12:22 2017 +0200 refs #1373 récuppération de modifications écrasées Summary of changes: README.md | 75 +++++++------- .../lima/business/ServiceMonitorableHandler.java | 4 +- .../chorem/lima/business/LimaBusinessConfig.java | 6 +- .../lima/business/LimaConfigurationHelper.java | 10 +- .../org/chorem/lima/business/LimaTestsConfig.java | 4 - .../src/main/xmi/lima-callao-model.properties | 2 - lima-server/README.md | 32 +++--- pom.xml | 21 ++-- src/site/resources/screens/lima_preferences.png | Bin 0 -> 31616 bytes .../screens/lima_reports_menu_global_menu.png | Bin 0 -> 37662 bytes src/site/rst/backup.rst | 14 +++ src/site/rst/contact.rst | 2 +- src/site/rst/features.rst | 53 +++++++--- src/site/rst/importexport.rst | 3 - src/site/rst/install.rst | 53 ++++++++++ src/site/rst/rapports.rst | 108 ++++++++++++--------- src/site/site.xml | 1 + 17 files changed, 241 insertions(+), 147 deletions(-) create mode 100644 src/site/resources/screens/lima_preferences.png create mode 100644 src/site/resources/screens/lima_reports_menu_global_menu.png create mode 100644 src/site/rst/backup.rst -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.