Merge remote-tracking branch 'remotes/origin/dev' into issue/1049

This commit is contained in:
m0duspwnens
2020-08-10 16:36:49 -04:00
21 changed files with 853 additions and 215 deletions
+1
View File
@@ -64,6 +64,7 @@ firewall:
redis:
tcp:
- 6379
- 9696
salt_manager:
tcp:
- 4505