[java-idp-jetty-base] 03/04: Merge branch '9.4' into 9.4-windows

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch 9.4-windows
in repository java-idp-jetty-base.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=8cb3144da3d9f693926a8e075d22e4205e4ce670

commit 8cb3144da3d9f693926a8e075d22e4205e4ce670
Merge: 9d3fc22 58cd3db
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Sep 5 11:02:58 2018 +0100

    Merge branch '9.4' into 9.4-windows

 src/main/resources/jetty-base/etc/idp-backchannel.xml     | 6 +++---
 src/main/resources/jetty-base/start.d/idp-backchannel.ini | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.