resolving conflicts in 4.3 merge

This commit is contained in:
vcerenu
2022-11-30 15:27:48 -03:00
10 changed files with 27 additions and 21 deletions
+5
View File
@@ -1,6 +1,11 @@
# Change Log
All notable changes to this project will be documented in this file.
## Wazuh Docker v4.4.0
### Added
- Update Wazuh to version [4.4.0](https://github.com/wazuh/wazuh/blob/v4.4.0/CHANGELOG.md#v440)
## Wazuh Docker v4.3.10
### Added