aboutsummaryrefslogtreecommitdiff
path: root/id/.settings
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-01-23 14:10:24 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-01-23 14:10:24 +0100
commit9eb81a78755db5c9735d2a43ee91fb11ce62e58e (patch)
tree91ed5dd8a8dcb9b6ebb43ec32d782a9bff410405 /id/.settings
parent587971b14627083236df96b8a79f005f92990d75 (diff)
parentd9550b5e3f24a0f6013502dcc632c4d2730a6749 (diff)
downloadmoa-id-spss-9eb81a78755db5c9735d2a43ee91fb11ce62e58e.tar.gz
moa-id-spss-9eb81a78755db5c9735d2a43ee91fb11ce62e58e.tar.bz2
moa-id-spss-9eb81a78755db5c9735d2a43ee91fb11ce62e58e.zip
Merge branch 'moa2_0_tlenz' into moa_2.0_OAuth
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/assertion/PVP2AssertionBuilder.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateReferenceValueAttributeBuilder.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/requestHandler/AuthnRequestHandler.java id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
Diffstat (limited to 'id/.settings')
0 files changed, 0 insertions, 0 deletions