Clone
Dan Haywood <dan@haywood-associates.co.uk>
committed
on 12 Nov 17
Merge branch 'master' into dev/2.0.0/ISIS-1632-meta-annotations
# Conflicts:
# core/runtime/src/main/java/org/apache/isis/core/runtime/runne… Show more
Merge branch 'master' into dev/2.0.0/ISIS-1632-meta-annotations

# Conflicts:

#       core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisInjectModule.java

#       core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java

#       core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/InvokeKeys.java

#       core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java

#       example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.java

#       example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java

#       example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java

#       example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository.java

#       example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository_Test.java

#       example/application/simpleapp/pom.xml

Show less

master + 19 more