[zoneminder/f29: 3/3] Merge branch 'master' into f29
commit af2b48782d6bf2bc3583a992f50e5394364673bd
Merge: 144e273 5d0dceb
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Sat Oct 13 14:09:32 2018 -0500
Merge branch 'master' into f29
.gitignore | 1 +
sources | 2 +-
zoneminder.spec | 8 ++++++--
3 files changed, 8 insertions(+), 3 deletions(-)
---