Merge branch 'master' into ackbar
This commit is contained in:
commit
f107b50a46
21 changed files with 428 additions and 272 deletions
|
@ -3,6 +3,6 @@ workers = 2
|
|||
worker_class = 'gevent'
|
||||
timeout = 2000
|
||||
daemon = False
|
||||
logconfig = 'conf/logging.conf'
|
||||
logconfig = 'conf/logging_debug.conf'
|
||||
pythonpath = '.'
|
||||
preload_app = True
|
||||
|
|
Reference in a new issue