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

# Conflicts:

#       core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java

Show less

master + 17 more