You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@isis.apache.org by da...@apache.org on 2018/09/14 16:38:31 UTC

[isis] 06/06: Merge branch 'master' into v2

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git

commit b76db5d4c429f597e65b104179fce6961de5f850
Merge: 0426ad4 d87a07c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Sep 14 17:37:17 2018 +0100

    Merge branch 'master' into v2
    
    # Conflicts:
    #	adocs/documentation/src/main/asciidoc/__versions.adoc

 .gitlab-ci.yml                                     | 64 +++++++++-------------
 .../module-simple/logging-integtest.properties     |  2 +-
 2 files changed, 28 insertions(+), 38 deletions(-)