aboutsummaryrefslogtreecommitdiff
path: root/id/server/doc/htmlTemplates
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-03-04 14:00:21 +0100
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-03-04 14:00:21 +0100
commite4350d795922f798ff2edc53933c99d4a24a3bc9 (patch)
treedc33231a27df9245b5d17fd5615bb0c2ea7609ed /id/server/doc/htmlTemplates
parent8dbc7af299d5e7a1dd4d1085d2840ff00f403bbb (diff)
parent9ad88e1713f61f69f5ff6c25da7df9aca11d8baf (diff)
downloadmoa-id-spss-e4350d795922f798ff2edc53933c99d4a24a3bc9.tar.gz
moa-id-spss-e4350d795922f798ff2edc53933c99d4a24a3bc9.tar.bz2
moa-id-spss-e4350d795922f798ff2edc53933c99d4a24a3bc9.zip
Merge branch 'ap' into moa2_0_tlenz_bs_3
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
Diffstat (limited to 'id/server/doc/htmlTemplates')
0 files changed, 0 insertions, 0 deletions