[zoneminder/el7: 2/2] Merge branch 'master' into el7
commit 9857660fd57c0f986a66b7ccf44c762d57e78cc0
Merge: 6bc4526 440ed5c
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Sat Feb 29 10:15:32 2020 -0600
Merge branch 'master' into el7
.gitignore | 1 +
sources | 3 +--
zoneminder.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
---