Commit 2e51a28d authored by ibuler's avatar ibuler

Merge remote-tracking branch 'origin/dev' into dev

parents 0bd33ec8 813e10ed
......@@ -34,7 +34,6 @@ ephem==3.7.6.0
eventlet==0.21.0
ForgeryPy==0.1
greenlet==0.4.12
gssapi==1.2.4
gunicorn==19.7.1
idna==2.6
itsdangerous==0.24
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment