diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2019-12-13 10:13:05 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2019-12-13 10:13:05 +0100 |
| commit | 6fc2e600055d4737ce94d8a012eb3764bd7e93c8 (patch) | |
| tree | 56aebaaac2c87458ebfd798a2c66f95718e1dd4e /id/server/data/deploy/conf/moa-id-configuration | |
| parent | de2e45024694c7eb5e033bc6b1bcb90f5f499b07 (diff) | |
| parent | bea0d19650b5fbbb48fcda0f39ef3a93d6cf6f1f (diff) | |
| download | moa-id-spss-6fc2e600055d4737ce94d8a012eb3764bd7e93c8.tar.gz moa-id-spss-6fc2e600055d4737ce94d8a012eb3764bd7e93c8.tar.bz2 moa-id-spss-6fc2e600055d4737ce94d8a012eb3764bd7e93c8.zip | |
Merge branch 'current_development' into development_preview
# Conflicts:
# id/history.txt
# id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
# pom.xml
Diffstat (limited to 'id/server/data/deploy/conf/moa-id-configuration')
0 files changed, 0 insertions, 0 deletions