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:11:59 UTC

[isis] 18/19: Merge master (6eca40987c939fe967fe323cbf671bd9b31c3f69) 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 85f266924689b0aba3a5d0778193ca3e1e56eb41
Merge: 84a8d5d 6eca409
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Sep 14 16:38:59 2018 +0100

    Merge master (6eca40987c939fe967fe323cbf671bd9b31c3f69) into v2
    
    # Conflicts:
    #	adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_framework-provided.adoc
    #	core/applib/pom.xml
    #	core/maven-plugin/pom.xml
    #	core/pom.xml
    #	core/webdocker/pom.xml
    #	example/application/simpleapp/module-simple/pom.xml
    #	example/application/simpleapp/pom.xml