Merge branch 'master' into user-abstraction
This commit is contained in:
commit
ccdf0801a8
@ -20,7 +20,7 @@
|
|||||||
import flask
|
import flask
|
||||||
from flask import request, Response, abort, send_from_directory
|
from flask import request, Response, abort, send_from_directory
|
||||||
from multiprocessing import Process
|
from multiprocessing import Process
|
||||||
from gevent.wsgi import WSGIServer
|
from gevent.pywsgi import WSGIServer
|
||||||
import sys, random, threading, hmac, hashlib, base64, time, math, os, json
|
import sys, random, threading, hmac, hashlib, base64, time, math, os, json
|
||||||
from core import Core
|
from core import Core
|
||||||
from onionrblockapi import Block
|
from onionrblockapi import Block
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
urllib3==1.23
|
urllib3==1.23
|
||||||
requests==2.18.4
|
requests==2.18.4
|
||||||
PyNaCl==1.2.1
|
PyNaCl==1.2.1
|
||||||
gevent==1.2.2
|
gevent==1.3.6
|
||||||
sha3==0.2.1
|
sha3==0.2.1
|
||||||
defusedxml==0.5.0
|
defusedxml==0.5.0
|
||||||
simple_crypt==4.1.7
|
simple_crypt==4.1.7
|
||||||
|
Loading…
Reference in New Issue
Block a user