Merge remote-tracking branch 'kobo/shelves' into Develop

# Conflicts: # cps/kobo.py # cps/shelf.py
2020-04-24 16:56:08 +02:00
parent 95ca1e6a9d 742ec2b38d
commit e29f17ac46
6 changed files with 18 additions and 15 deletions
--- a/cps/server.py
+++ b/cps/server.py
@@ -24,7 +24,7 @@ import signal
 import socket

 try:
-    from gevent.pywsgi import WSGIServer
+    from gevent.pywtsgi import WSGIServer
    from gevent.pool import Pool
    from gevent import __version__ as _version
    VERSION = 'Gevent ' + _version