diff options
| author | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-02-25 19:01:11 +0100 |
|---|---|---|
| committer | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-02-25 19:01:11 +0100 |
| commit | 8d438e785622695d55dbff05f8383447ff4eb251 (patch) | |
| tree | 91d5de425541d908a675865c69d759afe6429831 /id/server/proxy | |
| parent | e352ed4ac809c333ebbba3421f8cb1857850535b (diff) | |
| parent | 26404cedff0e60969c98d7a7cab30f8e7eda9ea6 (diff) | |
| download | moa-id-spss-8d438e785622695d55dbff05f8383447ff4eb251.tar.gz moa-id-spss-8d438e785622695d55dbff05f8383447ff4eb251.tar.bz2 moa-id-spss-8d438e785622695d55dbff05f8383447ff4eb251.zip | |
Merge branch 'ap' into moa2_0_tlenz_bs_3
Conflicts:
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
Diffstat (limited to 'id/server/proxy')
0 files changed, 0 insertions, 0 deletions