diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-09-15 13:42:36 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-09-15 13:42:36 +0200 |
| commit | 8074865580b5fa28817b37c9ad2e8c992ebef977 (patch) | |
| tree | 475cd1ed9bc517dffbf023e7d9c7d16ce2bde8c5 /id/server/doc/conf/moa-spss/sslKeys/customer2 | |
| parent | 234f17d14f9f48655c27d54114df0aa2593cf6d8 (diff) | |
| parent | 714a8cb32dd5585829dfc1926e56971425a2a692 (diff) | |
| download | moa-id-spss-8074865580b5fa28817b37c9ad2e8c992ebef977.tar.gz moa-id-spss-8074865580b5fa28817b37c9ad2e8c992ebef977.tar.bz2 moa-id-spss-8074865580b5fa28817b37c9ad2e8c992ebef977.zip | |
Merge branch 'moa-2.1-Snapshot'
Conflicts:
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
pom.xml
Diffstat (limited to 'id/server/doc/conf/moa-spss/sslKeys/customer2')
| -rw-r--r-- | id/server/doc/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2.der | bin | 1076 -> 0 bytes |
| -rw-r--r-- | id/server/doc/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2[pwd=kunde2].p12 | bin | 4893 -> 0 bytes |
| -rw-r--r-- | id/server/doc/conf/moa-spss/sslKeys/customer2/trustedServers[pwd=servers].keystore | bin | 1202 -> 0 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/id/server/doc/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2.der b/id/server/doc/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2.der Binary files differdeleted file mode 100644 index f50aa4d68..000000000 --- a/id/server/doc/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2.der +++ /dev/null diff --git a/id/server/doc/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2[pwd=kunde2].p12 b/id/server/doc/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2[pwd=kunde2].p12 Binary files differdeleted file mode 100644 index e5820fdf2..000000000 --- a/id/server/doc/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2[pwd=kunde2].p12 +++ /dev/null diff --git a/id/server/doc/conf/moa-spss/sslKeys/customer2/trustedServers[pwd=servers].keystore b/id/server/doc/conf/moa-spss/sslKeys/customer2/trustedServers[pwd=servers].keystore Binary files differdeleted file mode 100644 index bd9765a4c..000000000 --- a/id/server/doc/conf/moa-spss/sslKeys/customer2/trustedServers[pwd=servers].keystore +++ /dev/null |