From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 30 May 2019 20:16:12 +0000 (+0200)
Subject: Merge branch 'rp1' of git://github.com/doomy23/DeeFuzzer into doomy23-rp1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=79b77451bb3375df9984546776f727cb00c40285;p=deefuzzer.git

Merge branch 'rp1' of git://github.com/doomy23/DeeFuzzer into doomy23-rp1
---

79b77451bb3375df9984546776f727cb00c40285
diff --cc deefuzzer/station.py
index c406303,896b324..29c3cf2
--- a/deefuzzer/station.py
+++ b/deefuzzer/station.py
@@@ -46,7 -46,7 +46,8 @@@ import shou
  import urllib
  import mimetypes
  import json
 +import hashlib
+ import MySQLdb as mdb
  
  from threading import Thread
  from player import *