From: yomguy <yomguy@parisson.com>
Date: Thu, 7 Nov 2013 22:18:51 +0000 (+0100)
Subject: Merge branch 'dev' of git.parisson.com:git/telecaster-instance into nuc
X-Git-Tag: 1.0~8
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=43d147afd8812eb061801cc01cf2fc82ab1efa5e;p=telecaster-instance.git

Merge branch 'dev' of git.parisson.com:git/telecaster-instance into nuc

Conflicts:
	settings.py
	settings.pyc
---

43d147afd8812eb061801cc01cf2fc82ab1efa5e
diff --cc settings.py
index 62623e4,47d02f6..efcfc8e
--- a/settings.py
+++ b/settings.py
@@@ -197,4 -195,6 +195,6 @@@ TELEFORMA_E_LEARNING_TYPE = 'CRFPA
  TELEFORMA_GLOBAL_TWEETER = False
  TELEFORMA_PERIOD_TWEETER = True
  
 -ROUTER_IP = '81.57.221.26'
++ROUTER_IP = '192.168.1.1'
+