This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch dev/2.0.0/ISIS-1767-jee-7
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e4e5203dcffe0517169150525f9d884d9399a770
Merge: 50ac764 aec3f28
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Sun Nov 12 20:04:53 2017 +0100
Merge branch 'dev/2.0.0/ISIS-1767-jee-7' of
https://github.com/apache/isis into dev/2.0.0/ISIS-1767-jee-7
Conflicts:
core/metamodel/src/main/java/org/apache/isis/core/webapp/WebAppContextSupport.java
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <commits@isis.apache.org>.
