Merging conflicts

CHANGELOG.md

@@ -7,6 +7,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [7.9.0] - 2022-04-19
+
+### Added
+
+- Log streams support [#495]
+
+### Fixed
+
+- `##` String keyword replacements now work when nested inside `@@` array replacements [#504]
+
+## [7.8.0] - 2022-04-14
+
+### Added
+
+- Type declarations for more seamless integration into Typescript projects when used as a module [#485]
+
+### Security
+
+- Updated Winston from 2.3.x to 3.3.0 which applies fix for theoretical prototype pollution vulnerability [#497]
+
 ## [7.7.1] - 2022-04-07
 
 ### Added
@@ -666,7 +686,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#478]: https://github.com/auth0/auth0-deploy-cli/issues/478
 [#481]: https://github.com/auth0/auth0-deploy-cli/issues/481
 [#482]: https://github.com/auth0/auth0-deploy-cli/issues/482
-[unreleased]: https://github.com/auth0/auth0-deploy-cli/compare/v7.7.1...HEAD
+[#485]: https://github.com/auth0/auth0-deploy-cli/issues/485
+[#495]: https://github.com/auth0/auth0-deploy-cli/issues/495
+[#497]: https://github.com/auth0/auth0-deploy-cli/issues/497
+[#504]: https://github.com/auth0/auth0-deploy-cli/issues/504
+[unreleased]: https://github.com/auth0/auth0-deploy-cli/compare/v7.9.0...HEAD
+[7.9.0]: https://github.com/auth0/auth0-deploy-cli/compare/v7.8.0...v7.9.0
+[7.8.0]: https://github.com/auth0/auth0-deploy-cli/compare/v7.7.1...v7.8.0
 [7.7.1]: https://github.com/auth0/auth0-deploy-cli/compare/v7.7.0...v7.7.1
 [7.7.0]: https://github.com/auth0/auth0-deploy-cli/compare/v7.6.0...v7.7.0
 [7.6.0]: https://github.com/auth0/auth0-deploy-cli/compare/v7.5.2...v7.6.0

README.md

@@ -16,7 +16,7 @@ Supported Auth0 Management API resources
 - [x] [Grants](https://auth0.com/docs/api/management/v2#!/Grants/get_grants)
 - [x] [Hooks](https://auth0.com/docs/api/management/v2#!/Hooks/get_hooks)
 - [x] [Hook Secrets](https://auth0.com/docs/api/management/v2/#!/Hooks/get_secrets)
-- [ ] [Log Streams](https://auth0.com/docs/api/management/v2#!/Log_Streams/get_log_streams)
+- [x] [Log Streams](https://auth0.com/docs/api/management/v2#!/Log_Streams/get_log_streams)
 - [ ] [Logs](https://auth0.com/docs/api/management/v2#!/Logs/get_logs)
 - [x] [Organizations](https://auth0.com/docs/api/management/v2#!/Organizations/get_organizations)
 - [ ] [Prompts](https://auth0.com/docs/api/management/v2#!/Prompts/get_prompts)