diff options
author | Christian Maierhofer <cmaierhofer@iaik.tugraz.at> | 2016-06-29 11:16:35 +0200 |
---|---|---|
committer | Christian Maierhofer <cmaierhofer@iaik.tugraz.at> | 2016-06-29 11:16:35 +0200 |
commit | ad156aaec0e4e8cd97a6eee6aa96e9d5700d0b4f (patch) | |
tree | 046064b84e29aada56546439db931fe830cd9eb4 /repository/iaik/iaik_jce_me4se/3.04/iaik_jce_me4se-3.04.pom | |
parent | 7717d75918fb63ee7e9d7bf31de2696577b7e991 (diff) | |
parent | b3aa8b6d444e7dee51e1145e3192b191ae24b1d4 (diff) | |
download | moa-id-spss-ad156aaec0e4e8cd97a6eee6aa96e9d5700d0b4f.tar.gz moa-id-spss-ad156aaec0e4e8cd97a6eee6aa96e9d5700d0b4f.tar.bz2 moa-id-spss-ad156aaec0e4e8cd97a6eee6aa96e9d5700d0b4f.zip |
Merge branch 'eIDAS_node_implementation_remote' into moapid-3.2-opb-redis
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractController.java
id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AssertionStore.java
Diffstat (limited to 'repository/iaik/iaik_jce_me4se/3.04/iaik_jce_me4se-3.04.pom')
-rw-r--r-- | repository/iaik/iaik_jce_me4se/3.04/iaik_jce_me4se-3.04.pom | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/repository/iaik/iaik_jce_me4se/3.04/iaik_jce_me4se-3.04.pom b/repository/iaik/iaik_jce_me4se/3.04/iaik_jce_me4se-3.04.pom deleted file mode 100644 index e6909b2ac..000000000 --- a/repository/iaik/iaik_jce_me4se/3.04/iaik_jce_me4se-3.04.pom +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><project> - <modelVersion>4.0.0</modelVersion> - <groupId>iaik</groupId> - <artifactId>iaik_jce_me4se</artifactId> - <version>3.04</version> - <description>POM was created from install:install-file</description> -</project>
\ No newline at end of file |