aboutsummaryrefslogtreecommitdiff
path: root/id/server/stork-saml-engine
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2013-11-13 10:21:57 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2013-11-13 10:21:57 +0100
commitad6cd1e156a7fcdadedf7fe7b54dedf8c0c897b1 (patch)
treef01ad482013d2b45e275be3fc39b59ba02a8de72 /id/server/stork-saml-engine
parent5a75a47186f080508052b8c197aaec8eba013362 (diff)
parentf6c9d4d2f12db71cf1195f0f0f932cf808289bb4 (diff)
downloadmoa-id-spss-ad6cd1e156a7fcdadedf7fe7b54dedf8c0c897b1.tar.gz
moa-id-spss-ad6cd1e156a7fcdadedf7fe7b54dedf8c0c897b1.tar.bz2
moa-id-spss-ad6cd1e156a7fcdadedf7fe7b54dedf8c0c897b1.zip
Merge branch 'moa2_0_tlenz' into moa_2.0_OAuth
Conflicts: id/ConfigWebTool/pom.xml
Diffstat (limited to 'id/server/stork-saml-engine')
-rw-r--r--id/server/stork-saml-engine/pom.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/id/server/stork-saml-engine/pom.xml b/id/server/stork-saml-engine/pom.xml
index 4243dc8fc..1988b9af0 100644
--- a/id/server/stork-saml-engine/pom.xml
+++ b/id/server/stork-saml-engine/pom.xml
@@ -86,7 +86,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.6.4</version>
- <scope>runtime</scope>
+ <!-- scope>runtime</scope -->
</dependency>
</dependencies>
</project> \ No newline at end of file