From: test test <yoanl@pilotsystems.net>
Date: Thu, 10 Jun 2021 13:02:49 +0000 (+0200)
Subject: Merge branch 'feature/docker-chat' into feature/docker-py3
X-Git-Tag: 2.1~66^2^2~34
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a5daa10cc791cfd4e96028658cf3a28f11d26cf0;p=teleforma.git

Merge branch 'feature/docker-chat' into feature/docker-py3
---

a5daa10cc791cfd4e96028658cf3a28f11d26cf0
diff --cc app/settings.py
index bfd76de1,2903d439..2d92566a
--- a/app/settings.py
+++ b/app/settings.py
@@@ -142,11 -157,10 +157,10 @@@ INSTALLED_APPS = 
      'django.contrib.sites',
      'django.contrib.messages',
      'django.contrib.staticfiles',
 +    'teleforma',
      'jazzmin',
      'django.contrib.admin',
-     # 'south',
-     
+     'channels',
 -    'teleforma',
      'teleforma.webclass',
      'teleforma.exam',
      'jsonrpc',