resolving conflicts

This commit is contained in:
vcerenu
2023-10-23 05:39:31 -03:00
19 changed files with 101 additions and 32 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.8.0
### Added
- Update Wazuh to version [4.8.0](https://github.com/wazuh/wazuh/blob/v4.8.0/CHANGELOG.md#v480)
## Wazuh Docker v4.7.1
### Added