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

Posted to commits@isis.apache.org by ah...@apache.org on 2019/12/12 18:18:05 UTC

[isis] 03/03: Merge remote-tracking branch 'origin/master'

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

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 8e8549eca0b4ef382b8a524dcd69566fb24153b7
Merge: c8feea8 bc37df1
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 12 19:17:27 2019 +0100

    Merge remote-tracking branch 'origin/master'

 .../org/apache/isis/config/IsisConfiguration.java  | 15 ++++++--
 .../additional-spring-configuration-metadata.json  | 39 -------------------
 .../viewer/wicket/ui/pages/bootstrap-overrides.css |  3 ++
 core/webapp/pom.xml                                |  5 +++
 examples/demo/src/main/resources/application.yml   |  9 ++---
 .../demo/src/main/resources/static/css/page.css    | 45 ++++++++++++++++++++++
 examples/demo/src/main/resources/static/index.html | 30 +--------------
 .../demo/src/main/resources/templates/error.html   | 20 ++++++++++
 8 files changed, 89 insertions(+), 77 deletions(-)