Clone
danhaywood <dan@haywood-associates.co.uk>
committed
on 30 Oct 18
Merge branch 'master' into v2
ISIS-2027 (health check)

# Conflicts:
# core/applib/src/main/java/org/apache/isis/applib/services/wrapper/Wra… Show more
Merge branch 'master' into v2

ISIS-2027 (health check)

# Conflicts:

#       core/applib/src/main/java/org/apache/isis/applib/services/wrapper/WrapperFactory.java

#       example/application/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml

Show less

master + 22 more