commit 6522d0afeb0b18e5a826a6f350b2b79fb276f0be Merge: 9f2cf6b 3f96767 Author: Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; Date: Sat Jan 18 11:32:52 2020 -0600 Merge branch 'master' into el7 .gitignore | 1 + sources | 6 +++--- zoneminder.spec | 34 +++++++++++++++++++++++++++------- 3 files changed, 31 insertions(+), 10 deletions(-) ---