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_tsl/maven-metadata-local.xml | |
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_tsl/maven-metadata-local.xml')
-rw-r--r-- | repository/iaik/iaik_tsl/maven-metadata-local.xml | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/repository/iaik/iaik_tsl/maven-metadata-local.xml b/repository/iaik/iaik_tsl/maven-metadata-local.xml deleted file mode 100644 index 9b36d1a39..000000000 --- a/repository/iaik/iaik_tsl/maven-metadata-local.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>iaik</groupId> - <artifactId>iaik_tsl</artifactId> - <versioning> - <release>1.0</release> - <versions> - <version>0.0.1-SNAPSHOT</version> - <version>0.5</version> - <version>1.0</version> - </versions> - <lastUpdated>20140130172750</lastUpdated> - </versioning> -</metadata> |