[zoneminder/f28: 3/3] Merge branch 'master' into f28
commit 67e47f498096918f7169abde4f74d4d8eff9570c
Merge: 40ff3fe b161175
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Sat Dec 8 10:06:22 2018 -0600
Merge branch 'master' into f28
.gitignore | 1 +
sources | 2 +-
zoneminder.spec | 225 ++++++++++++++++++++++++++++++++++++++++----------------
3 files changed, 164 insertions(+), 64 deletions(-)
---