diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-01-16 07:46:09 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-01-16 07:46:09 +0100 |
| commit | f50df2907e144784d77097653f9896b6c6a69361 (patch) | |
| tree | 35677411c79a68aba792237e9d5022fad2191a2d /id/server/idserverlib/.gitignore | |
| parent | 6d242194721574b6f7284f8b705a518d2f39b36f (diff) | |
| parent | c0ce67ebe2c4882b71ef04d64a6db7e3db416ce4 (diff) | |
| download | moa-id-spss-f50df2907e144784d77097653f9896b6c6a69361.tar.gz moa-id-spss-f50df2907e144784d77097653f9896b6c6a69361.tar.bz2 moa-id-spss-f50df2907e144784d77097653f9896b6c6a69361.zip | |
Merge branch 'ISA-1.18-action' into during_authsource_refactoring
Conflicts:
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/SAMLVerificationEngine.java
pom.xml
Diffstat (limited to 'id/server/idserverlib/.gitignore')
| -rw-r--r-- | id/server/idserverlib/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/id/server/idserverlib/.gitignore b/id/server/idserverlib/.gitignore index ea8c4bf7f..19f2e002c 100644 --- a/id/server/idserverlib/.gitignore +++ b/id/server/idserverlib/.gitignore @@ -1 +1,2 @@ /target +/target |