summaryrefslogtreecommitdiff
path: root/eaaf-springboot-utils/src
diff options
context:
space:
mode:
authorThomas <>2021-04-16 15:13:37 +0200
committerThomas <>2021-04-16 15:13:37 +0200
commitaf378b443868a0fecc5176a263dbd42718424d14 (patch)
treebefa161d2e34e0a864a0f91c69e9c780318d3dd7 /eaaf-springboot-utils/src
parentb8b5f661b4b16f2ae82e9a63bf1e2d9279e1dcbc (diff)
parent4a418d3a55752850891dbb9a6b10d03728a27520 (diff)
downloadEAAF-Components-af378b443868a0fecc5176a263dbd42718424d14.tar.gz
EAAF-Components-af378b443868a0fecc5176a263dbd42718424d14.tar.bz2
EAAF-Components-af378b443868a0fecc5176a263dbd42718424d14.zip
Merge branch 'feature/VT-21-016' of gitlab.iaik.tugraz.at:egiz/eaaf_components into feature/VT-21-016
# Conflicts: # eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java # eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java
Diffstat (limited to 'eaaf-springboot-utils/src')
0 files changed, 0 insertions, 0 deletions