aboutsummaryrefslogtreecommitdiff
path: root/id/readme_2.2.txt
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-02-22 14:31:15 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-02-22 14:31:15 +0100
commitf0efa491345c6df32cc645ec7ff3141b62b43b4e (patch)
tree25ee57d8433a705e2b0d080ca26ccf703d5c3395 /id/readme_2.2.txt
parent2fc3b03239590d98ad776710f84444d1b4f65df3 (diff)
parentdd2be368cdceab6b02bf9a73b6db08a05be53e69 (diff)
downloadmoa-id-spss-f0efa491345c6df32cc645ec7ff3141b62b43b4e.tar.gz
moa-id-spss-f0efa491345c6df32cc645ec7ff3141b62b43b4e.tar.bz2
moa-id-spss-f0efa491345c6df32cc645ec7ff3141b62b43b4e.zip
Merge branch 'moa-id-3.0.0-snapshot' into moa-id-3.2_(OPB)
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/SAMLVerificationEngine.java
Diffstat (limited to 'id/readme_2.2.txt')
0 files changed, 0 insertions, 0 deletions