Merge pull request #683 from ccrisan/rpi-omx

author Calin Crisan <ccrisan@gmail.com>

Mon, 2 Oct 2017 20:08:05 +0000 (23:08 +0300)

committer GitHub <noreply@github.com>

Mon, 2 Oct 2017 20:08:05 +0000 (23:08 +0300)
author Calin Crisan <ccrisan@gmail.com>
Mon, 2 Oct 2017 20:08:05 +0000 (23:08 +0300)
committer GitHub <noreply@github.com>
Mon, 2 Oct 2017 20:08:05 +0000 (23:08 +0300)
diff --cc motioneye/config.py
Simple merge
diff --cc motioneye/templates/main.html
Simple merge
author	Calin Crisan <ccrisan@gmail.com>
	Mon, 2 Oct 2017 20:08:05 +0000 (23:08 +0300)
committer	GitHub <noreply@github.com>
	Mon, 2 Oct 2017 20:08:05 +0000 (23:08 +0300)
		1	2
motioneye/config.py	patch \|	diff1 \|	diff2 \|	blob \| history
motioneye/templates/main.html	patch \|	diff1 \|	diff2 \|	blob \| history