Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion into dev

This commit is contained in:
William Wernert
2020-10-09 08:51:45 -04:00
7 changed files with 8 additions and 7 deletions
+1 -1
View File
@@ -4591,7 +4591,7 @@
]
},
"time": {
"from": "now-15m",
"from": "now-1h",
"to": "now"
},
"timepicker": {
+1 -1
View File
@@ -4137,7 +4137,7 @@
]
},
"time": {
"from": "now-15m",
"from": "now-1h",
"to": "now"
},
"timepicker": {
@@ -4883,7 +4883,7 @@
]
},
"time": {
"from": "now-30m",
"from": "now-1h",
"to": "now"
},
"timepicker": {
@@ -3658,7 +3658,7 @@
]
},
"time": {
"from": "now-30m",
"from": "now-1h",
"to": "now"
},
"timepicker": {
@@ -4396,7 +4396,7 @@
]
},
"time": {
"from": "now-15m",
"from": "now-1h",
"to": "now"
},
"timepicker": {
@@ -6651,7 +6651,7 @@
]
},
"time": {
"from": "now-15m",
"from": "now-1h",
"to": "now"
},
"timepicker": {