Merge branch 'master' of https://github.com/ccrisan/motioneye into movie-playback

author Dermot Duffy <dermot.duffy@gmail.com>

Tue, 30 May 2017 22:29:32 +0000 (23:29 +0100)

committer Dermot Duffy <dermot.duffy@gmail.com>

Tue, 30 May 2017 22:29:32 +0000 (23:29 +0100)
author Dermot Duffy <dermot.duffy@gmail.com>
Tue, 30 May 2017 22:29:32 +0000 (23:29 +0100)
committer Dermot Duffy <dermot.duffy@gmail.com>
Tue, 30 May 2017 22:29:32 +0000 (23:29 +0100)
diff --cc motioneye/handlers.py
Simple merge
diff --cc motioneye/mediafiles.py
Simple merge
diff --cc motioneye/static/js/main.js
Simple merge
author	Dermot Duffy <dermot.duffy@gmail.com>
	Tue, 30 May 2017 22:29:32 +0000 (23:29 +0100)
committer	Dermot Duffy <dermot.duffy@gmail.com>
	Tue, 30 May 2017 22:29:32 +0000 (23:29 +0100)
		1	2
motioneye/handlers.py	patch \|	diff1 \|	diff2 \|	blob \| history
motioneye/mediafiles.py	patch \|	diff1 \|	diff2 \|	blob \| history
motioneye/static/js/main.js	patch \|	diff1 \|	diff2 \|	blob \| history