diff options
| author | Thomas Knall <t.knall@datentechnik-innovation.com> | 2015-01-30 14:59:54 +0100 |
|---|---|---|
| committer | Thomas Knall <t.knall@datentechnik-innovation.com> | 2015-01-30 14:59:54 +0100 |
| commit | 202b235da770f0d8752a21391e411a701c6666cf (patch) | |
| tree | 1ec9e4ab72507e9bdce4c63dc9036850e51cbeb1 /id/server/legacy-backup/stork2-saml-engine/src/test/resources | |
| parent | e873da6795c75e37cd3b3e2cd0c41831157ffe32 (diff) | |
| parent | 23fc42a3c273ceb05938c741508537bfaedab00a (diff) | |
| download | moa-id-spss-202b235da770f0d8752a21391e411a701c6666cf.tar.gz moa-id-spss-202b235da770f0d8752a21391e411a701c6666cf.tar.bz2 moa-id-spss-202b235da770f0d8752a21391e411a701c6666cf.zip | |
Merge branch 'MOAID-62'
Conflicts:
id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
Diffstat (limited to 'id/server/legacy-backup/stork2-saml-engine/src/test/resources')
0 files changed, 0 insertions, 0 deletions