Merge pull request #186 from bovine/upload-types

author Calin Crisan <ccrisan@gmail.com>

Wed, 18 May 2016 20:32:29 +0000 (23:32 +0300)

committer Calin Crisan <ccrisan@gmail.com>

Wed, 18 May 2016 20:32:29 +0000 (23:32 +0300)
author Calin Crisan <ccrisan@gmail.com>
Wed, 18 May 2016 20:32:29 +0000 (23:32 +0300)
committer Calin Crisan <ccrisan@gmail.com>
Wed, 18 May 2016 20:32:29 +0000 (23:32 +0300)
diff --cc motioneye/config.py
Simple merge
diff --cc motioneye/handlers.py
Simple merge
author	Calin Crisan <ccrisan@gmail.com>
	Wed, 18 May 2016 20:32:29 +0000 (23:32 +0300)
committer	Calin Crisan <ccrisan@gmail.com>
	Wed, 18 May 2016 20:32:29 +0000 (23:32 +0300)
		1	2
motioneye/config.py	patch \|	diff1 \|	diff2 \|	blob \| history
motioneye/handlers.py	patch \|	diff1 \|	diff2 \|	blob \| history