From: yomguy <yomguy@parisson.com>
Date: Wed, 11 Jul 2012 09:33:20 +0000 (+0200)
Subject: Merge branch 'dev' into feature/telecaster
X-Git-Tag: 0.7-dev~14^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c0112aeb0f4a96792d044537e8d1a82738d08d1e;p=teleforma.git

Merge branch 'dev' into feature/telecaster

Conflicts:
	example/settings.py
	teleforma/templates/teleforma/inc/conference_list.html
---

c0112aeb0f4a96792d044537e8d1a82738d08d1e
diff --cc example/settings.py
index 8c01e684,b604f974..f145c9c6
--- a/example/settings.py
+++ b/example/settings.py
@@@ -144,7 -145,7 +145,8 @@@ INSTALLED_APPS = 
      'timezones',
      'jqchat',
  #    'follow',
 -    'googletools',
++     'googletools',
 +     'telecaster',
  )
  
  TEMPLATE_CONTEXT_PROCESSORS = (
@@@ -183,4 -186,4 +187,8 @@@ POSTMAN_AUTO_MODERATE_AS = Tru
  
  #FILE_PROTECTION_METHOD = 'xsendfile'
  
++<<<<<<< HEAD
 +TELECASTER_CONF = '/etc/telecaster/telecaster.xml'
++=======
+ GOOGLE_ANALYTICS_MODEL = True
++>>>>>>> dev
diff --cc teleforma/templates/teleforma/inc/conference_list.html
index 518f48ae,2a49b277..be89b915
--- a/teleforma/templates/teleforma/inc/conference_list.html
+++ b/teleforma/templates/teleforma/inc/conference_list.html
@@@ -56,6 -44,6 +44,4 @@@
      </table>
  </div>
  
--
--
  {% endif %}