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

Conflicts:

        core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAppManifest.java

        core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerConfiguration.java

        core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java

Show less