Merge branch 'master' into user-abstraction

This commit is contained in:
Kevin Froman 2018-09-03 10:29:36 -05:00
commit ccdf0801a8
2 changed files with 2 additions and 2 deletions

View File

@ -20,7 +20,7 @@
import flask
from flask import request, Response, abort, send_from_directory
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
from core import Core
from onionrblockapi import Block

View File

@ -1,7 +1,7 @@
urllib3==1.23
requests==2.18.4
PyNaCl==1.2.1
gevent==1.2.2
gevent==1.3.6
sha3==0.2.1
defusedxml==0.5.0
simple_crypt==4.1.7