Clone
Andi Huber
committed
on 17 Jan 19
Merge remote-tracking branch 'origin/v2' into 2033-IoC
Conflicts:
core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java
c… Show more
Merge remote-tracking branch 'origin/v2' into 2033-IoC

Conflicts:

        core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java

        core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefaultTest_validateServices.java

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

Show less