fix
Merge branch 'hotfix/move_celery_config_in_general_config'