[zoneminder/f29: 3/3] Merge branch 'master' into f29
commit 776ab9890ab06fb0b4d8176b70283e69c4ace5ee
Merge: 3026a50 d06a60f
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Tue Oct 2 08:00:30 2018 -0500
Merge branch 'master' into f29
.gitignore | 1 +
sources | 2 +-
zoneminder.spec | 6 +++++-
3 files changed, 7 insertions(+), 2 deletions(-)
---