[zoneminder/el7: 2/2] Merge branch 'master' into el7
commit 4d03a64d7bf359eca44ff31e0312ae6302e75b25
Merge: 453ac84 c5c5a16
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Wed Aug 5 16:49:28 2020 -0500
Merge branch 'master' into el7
.gitignore | 1 +
sources | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
---