[zoneminder/el7: 2/3] Merge branch 'master' into el7
commit c916c14bbd74973b36067d730d8b372678aa6537
Merge: 21980c0 b161175
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Sat Dec 8 11:07:14 2018 -0600
Merge branch 'master' into el7
.gitignore | 1 +
sources | 2 +-
zoneminder.spec | 225 ++++++++++++++++++++++++++++++++++++++++----------------
3 files changed, 164 insertions(+), 64 deletions(-)
---