diff options
| author | Christian Maierhofer <cmaierhofer@iaik.tugraz.at> | 2016-06-29 11:16:35 +0200 |
|---|---|---|
| committer | Christian Maierhofer <cmaierhofer@iaik.tugraz.at> | 2016-06-29 11:16:35 +0200 |
| commit | ad156aaec0e4e8cd97a6eee6aa96e9d5700d0b4f (patch) | |
| tree | 046064b84e29aada56546439db931fe830cd9eb4 /id/assembly-auth-edu.xml | |
| parent | 7717d75918fb63ee7e9d7bf31de2696577b7e991 (diff) | |
| parent | b3aa8b6d444e7dee51e1145e3192b191ae24b1d4 (diff) | |
| download | moa-id-spss-ad156aaec0e4e8cd97a6eee6aa96e9d5700d0b4f.tar.gz moa-id-spss-ad156aaec0e4e8cd97a6eee6aa96e9d5700d0b4f.tar.bz2 moa-id-spss-ad156aaec0e4e8cd97a6eee6aa96e9d5700d0b4f.zip | |
Merge branch 'eIDAS_node_implementation_remote' into moapid-3.2-opb-redis
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractController.java
id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AssertionStore.java
Diffstat (limited to 'id/assembly-auth-edu.xml')
0 files changed, 0 insertions, 0 deletions