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 2019/01/04 13:13:25 UTC

[isis] 03/11: Merge branch 'release-1.17.0-RC3' 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 1297575e5d6d7feb4a13346c388b25c6a35ee5ef
Merge: 8287d3b b6daaac
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 4 10:23:21 2019 +0000

    Merge branch 'release-1.17.0-RC3' into v2
    
    # Conflicts:
    #	adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject.adoc

 .../asciidoc/guides/rgant/_rgant-DomainObject.adoc    |  3 ++-
 .../guides/rgant/_rgant-DomainObject_auditing.adoc    |  4 +---
 .../_rgant-DomainObject_autoCompleteRepository.adoc   |  5 ++++-
 .../guides/rgant/_rgant-DomainObject_bounded.adoc     | 10 +++++++---
 .../guides/rgant/_rgant-DomainObject_nature.adoc      | 19 ++++++++++++-------
 5 files changed, 26 insertions(+), 15 deletions(-)