aboutsummaryrefslogtreecommitdiff
path: root/moaSig/handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510
diff options
context:
space:
mode:
authorThomas <>2021-03-24 12:16:25 +0100
committerThomas <>2021-03-24 12:16:25 +0100
commit835a395f3ecb7477b5b67e9da9bf3af58c86473a (patch)
tree916fa7705879063f6b83517d80197c37dc53caf8 /moaSig/handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510
parenta972fba0402eca3c5fcfcd1eef1979808fd716a1 (diff)
parent666d8c9f8cec7573e60a14ab039c0874f6a9ec53 (diff)
downloadmoa-sig-835a395f3ecb7477b5b67e9da9bf3af58c86473a.tar.gz
moa-sig-835a395f3ecb7477b5b67e9da9bf3af58c86473a.tar.bz2
moa-sig-835a395f3ecb7477b5b67e9da9bf3af58c86473a.zip
Merge branch 'master' of gitlab.iaik.tugraz.at:egiz/moa-sig
# Conflicts: # moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java # moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
Diffstat (limited to 'moaSig/handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510')
-rw-r--r--moaSig/handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/620127A8E5886A4805403977C3EF7D5EAF881526bin870 -> 0 bytes
-rw-r--r--moaSig/handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/FCD9E881BCCCB9352EEF337C8D4EAAD65C4EC830bin1141 -> 0 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/moaSig/handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/620127A8E5886A4805403977C3EF7D5EAF881526 b/moaSig/handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/620127A8E5886A4805403977C3EF7D5EAF881526
deleted file mode 100644
index da38ce0..0000000
--- a/moaSig/handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/620127A8E5886A4805403977C3EF7D5EAF881526
+++ /dev/null
Binary files differ
diff --git a/moaSig/handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/FCD9E881BCCCB9352EEF337C8D4EAAD65C4EC830 b/moaSig/handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/FCD9E881BCCCB9352EEF337C8D4EAAD65C4EC830
deleted file mode 100644
index 7e9fd5b..0000000
--- a/moaSig/handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/FCD9E881BCCCB9352EEF337C8D4EAAD65C4EC830
+++ /dev/null
Binary files differ