Resolve the conflicts for #228

This commit is contained in:
Khanh Ngo
2018-04-02 13:38:53 +07:00
32 changed files with 1103 additions and 130 deletions

View File

@ -14,3 +14,6 @@ pyotp==2.2.6
qrcode==6.0
dnspython==1.15.0
gunicorn==19.7.1
python3-saml
pyOpenSSL>=0.15
pytz>=2017.3