aboutsummaryrefslogtreecommitdiff
path: root/basicConfig/ms-proxyservice/properties
diff options
context:
space:
mode:
authorThomas <>2022-08-02 14:00:57 +0200
committerThomas <>2022-08-02 14:00:57 +0200
commitf381c610acdecb06a8561389a4d1598738559948 (patch)
tree4e752580f0cfdf6963951c41335001188a27dff1 /basicConfig/ms-proxyservice/properties
parente0c0b219588322a0f0e7a891369b43ab6c853d71 (diff)
parent48f19dc45cec670fe62399d09fb34732fb4eeedc (diff)
downloadNational_eIDAS_Gateway-f381c610acdecb06a8561389a4d1598738559948.tar.gz
National_eIDAS_Gateway-f381c610acdecb06a8561389a4d1598738559948.tar.bz2
National_eIDAS_Gateway-f381c610acdecb06a8561389a4d1598738559948.zip
Merge branch 'nightlybuild' into feature/ms_proxy_service
# Conflicts: # ms_specific_proxyservice/src/test/resources/config/logback_config.xml
Diffstat (limited to 'basicConfig/ms-proxyservice/properties')
0 files changed, 0 insertions, 0 deletions