[zoneminder/el7: 3/4] Merge branch 'master' into el7
commit 61edd5bec09e8f887eca906ce888d3f05195ae15
Merge: 107c275 93f46f3
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Sun May 10 17:28:57 2020 -0500
Merge branch 'master' into el7
.gitignore | 3 +++
sources | 3 +--
zoneminder.spec | 13 +++++++++++--
3 files changed, 15 insertions(+), 4 deletions(-)
---