[zoneminder/el7: 3/3] Merge branch 'master' into el7
commit e29b84d9186b4a38a478fd4c39fc0cbc811203ed
Merge: 7d51487 d06a60f
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Tue Oct 2 08:05:55 2018 -0500
Merge branch 'master' into el7
.gitignore | 1 +
sources | 2 +-
zoneminder.spec | 6 +++++-
3 files changed, 7 insertions(+), 2 deletions(-)
---