Clone
danhaywood <dan@haywood-associates.co.uk>
committed
on 10 Jan
Merge remote-tracking branch 'origin/master' into ide
# Conflicts:
# core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppCo… Show more
Merge remote-tracking branch 'origin/master' into ide

# Conflicts:

#       core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppContextPath.java

#       core/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java

#       core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java

#       core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java

#       core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java

#       valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/ServerSentEventsServlet.java

Show less

master + 12 more