Merge pull request #631 from inodlite/mmalcam

author Calin Crisan <ccrisan@gmail.com>

Sun, 29 Oct 2017 12:37:22 +0000 (14:37 +0200)

committer GitHub <noreply@github.com>

Sun, 29 Oct 2017 12:37:22 +0000 (14:37 +0200)
author Calin Crisan <ccrisan@gmail.com>
Sun, 29 Oct 2017 12:37:22 +0000 (14:37 +0200)
committer GitHub <noreply@github.com>
Sun, 29 Oct 2017 12:37:22 +0000 (14:37 +0200)
diff --cc motioneye/config.py
Simple merge
diff --cc motioneye/handlers.py
Simple merge
diff --cc motioneye/static/js/main.js
Simple merge
author	Calin Crisan <ccrisan@gmail.com>
	Sun, 29 Oct 2017 12:37:22 +0000 (14:37 +0200)
committer	GitHub <noreply@github.com>
	Sun, 29 Oct 2017 12:37:22 +0000 (14:37 +0200)
		1	2
motioneye/config.py	patch \|	diff1 \|	diff2 \|	blob \| history
motioneye/handlers.py	patch \|	diff1 \|	diff2 \|	blob \| history
motioneye/static/js/main.js	patch \|	diff1 \|	diff2 \|	blob \| history