 Julius Pfrommer
|
a476806541
|
Merge remote-tracking branch 'origin/1.5' into merge_15_master
# Conflicts:
# .github/workflows/build_linux.yml
# CHANGES.md
# arch/common/eventloop_mqtt.c
# examples/encryption/server_encryption_filestore.c
# plugins/crypto/ua_certificategroup_filestore.c
# src/pubsub/ua_pubsub_networkmessage_json.c
# src/server/ua_discovery.h
# src/server/ua_discovery_mdns.c
# src/server/ua_discovery_mdns_avahi.c
# src/server/ua_services_attribute.c
# src/server/ua_services_discovery.c
# src/server/ua_services_monitoreditem.c
# src/server/ua_services_nodemanagement.c
# src/server/ua_subscription.c
# src/server/ua_subscription.h
# src/server/ua_subscription_alarms_conditions.c
# src/server/ua_subscription_event.c
# src/ua_types_encoding_json_105.c
# tests/client/check_activateSessionAsync.c
# tests/server/check_local_monitored_item.c
# tests/server/check_services_subscriptions.c
|
2026-09-03 14:33:21 +02:00 |
|