Clone
Andi Huber
committed
on 10 Jan 19
Merge remote-tracking branch 'apache/v2' into 2033-IoC
Conflicts:
core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object… Show more
Merge remote-tracking branch 'apache/v2' into 2033-IoC

Conflicts:

        core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java

        core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacetFactory.java

        core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java

        core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java

        core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java

        core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java

Show less