You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@isis.apache.org by da...@apache.org on 2021/06/12 08:27:51 UTC

[isis-app-simpleapp] 01/04: Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch jpa-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git

commit 0b9b88ef4a4f97ab1cd0831232f2752d412647dc
Merge: 03c0d06 01a8d81
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jun 3 07:01:37 2021 +0100

    Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT

 webapp/src/main/resources/shiro.ini | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)