From: yomguy <yomguy@parisson.com>
Date: Thu, 28 Jun 2018 12:16:22 +0000 (+0200)
Subject: Merge branch 'pb' into dev
X-Git-Tag: 1.0~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=42ca4493c2222fd643d21a7fd12773fcedba7adc;p=telecaster-instance.git

Merge branch 'pb' into dev

Conflicts:
	settings.py
---

42ca4493c2222fd643d21a7fd12773fcedba7adc
diff --cc settings.py
index efcfc8e,400cbc3..6c9b876
--- a/settings.py
+++ b/settings.py
@@@ -194,7 -196,6 +196,8 @@@ TELECASTER_CONF = [{'type':'mp3','serve
  TELEFORMA_E_LEARNING_TYPE = 'CRFPA'
  TELEFORMA_GLOBAL_TWEETER = False
  TELEFORMA_PERIOD_TWEETER = True
+ TELEFORMA_EXAM_MAX_SESSIONS = 12
  
 +ROUTER_IP = '192.168.1.1'
 +