aboutsummaryrefslogtreecommitdiff
path: root/id/server/moa-id-spring-initializer/src/main/java/at
diff options
context:
space:
mode:
authorChristian Maierhofer <cmaierhofer@iaik.tugraz.at>2016-06-29 15:30:11 +0200
committerChristian Maierhofer <cmaierhofer@iaik.tugraz.at>2016-06-29 15:30:11 +0200
commit00201834551ca5bb5a48ccdc67fc60d86b0aaa6b (patch)
treeb5fff339bf0d0c84001cd4216d590c954c29f82f /id/server/moa-id-spring-initializer/src/main/java/at
parent66a7c51bbad7e4394c656b627bc0cddf2a063741 (diff)
parent1d9f9528cba4b85c852aebdffd8699df5f22b302 (diff)
downloadmoa-id-spss-00201834551ca5bb5a48ccdc67fc60d86b0aaa6b.tar.gz
moa-id-spss-00201834551ca5bb5a48ccdc67fc60d86b0aaa6b.tar.bz2
moa-id-spss-00201834551ca5bb5a48ccdc67fc60d86b0aaa6b.zip
Merge branch 'currenteidas' into moapid-3.2-opb-redis
Conflicts: id/server/modules/moa-id-module-openID/src/test/java/test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java
Diffstat (limited to 'id/server/moa-id-spring-initializer/src/main/java/at')
0 files changed, 0 insertions, 0 deletions