[zoneminder/f29: 2/2] Merge branch 'master' into f29
commit 8a40feb5d2e8010504fda3baafe8403b59c205f9
Merge: 47ae56b 2116515
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Thu Sep 13 17:19:15 2018 -0500
Merge branch 'master' into f29
.gitignore | 3 +++
sources | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
---