Merge branch 'origin/release/1.2.4' into master
# 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:
parent
339a8f9b1b
commit
fe04ee65a1
9 changed files with 341 additions and 12 deletions
|
|
@ -126,6 +126,7 @@ ADD_EXECUTABLE (${PROJECT_NAME}
|
|||
${UTILS_DIR}/library.c
|
||||
${UTILS_DIR}/logger.c
|
||||
${UTILS_DIR}/str_t.c
|
||||
${UTILS_DIR}/timer.c
|
||||
${UTILS_DIR}/uuid.c
|
||||
${FCGISRV_DIR}/fcgi_map.c
|
||||
${FCGISRV_DIR}/fcgi_server.c
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue