From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 11 Sep 2015 13:29:04 +0000 (+0200)
Subject: Merge branch 'master' of git.parisson.com:git/diggersdigest
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a5d446b9c8d3812cce514862936a26a7706a7637;p=diggersdigest.git

Merge branch 'master' of git.parisson.com:git/diggersdigest

Conflicts:
	diggersdigest/templates/base.html
---

a5d446b9c8d3812cce514862936a26a7706a7637
diff --cc diggersdigest/templates/base.html
index c1669f4,7fa7f87..5fe8e66
--- a/diggersdigest/templates/base.html
+++ b/diggersdigest/templates/base.html
@@@ -105,7 -108,14 +105,6 @@@
  
  <div class="container">
  <div class="row">
 -{% comment - Remove left panel%}
 -<div class="col-md-2 left">
 -    {% block left_panel %}
 -    <div class="panel panel-default tree">{% page_menu "pages/menus/tree.html" %}</div>
 -    {% endblock %}
 -</div>
 -{% endcomment %}
--
  <div class="col-md-9 middle">
      {% block main %}{% endblock %}
  </div>