Merge pull request #46 from genjix/master

London Conference
This commit is contained in:
Jeff Garzik 2012-07-22 14:31:38 -07:00
commit 24e82dffa7
2 changed files with 16 additions and 2 deletions

View file

@ -147,13 +147,11 @@ ALERT:
<p><a class="btn" href="news.html">News archive</a></p>
</section>
</div>
<!--
<div class="span6">
{% for event in site.categories.events limit: 1 %}
<h1>{{ event.title }}</a></h1>
{{ event.content }}
{% endfor %}
</div>
-->
</div>
</div>