Merge branch 'origin/release/1.2.4' into master

Browse source

# Conflicts:
#	CMakeLists.txt
#	Dockerfile.micord
#	entrypoint.sh
#	src/modules/service_sign.c
#	src/utils/cryptopro.c
#	src/utils/cryptopro.h

...

This commit is contained in:

Наиля Алашкова 2025-02-18 10:24:16 +03:00

parent 339a8f9b1b

commit fe04ee65a1

9 changed files with 341 additions and 12 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

conf/cacerts/ucfk_2024.crt Normal file

View file

Binary file not shown.