From: Dermot Duffy <dermot.duffy@gmail.com>
Date: Wed, 28 Dec 2016 20:46:43 +0000 (+0000)
Subject: Merge branch 'master' of https://github.com/ccrisan/motioneye into movie-playback
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=7512138428c217e84156d96ed01abce4fb1e15c0;p=motioneye-debian

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

7512138428c217e84156d96ed01abce4fb1e15c0
diff --cc motioneye/handlers.py
index 69bb8dc,1d30196..215582f
--- a/motioneye/handlers.py
+++ b/motioneye/handlers.py
@@@ -16,9 -16,9 +16,10 @@@
  # along with this program.  If not, see <http://www.gnu.org/licenses/>. 
  
  import datetime
+ import hashlib
  import json
  import logging
 +import mimetypes
  import os
  import re
  import socket