Commit 92dce671 by Michael DeHaan

Resolve merge commit

parent d706aca8
...@@ -13,7 +13,12 @@ get_header(); ...@@ -13,7 +13,12 @@ get_header();
<div id="left-sidebar" class="span3 sidebar"> <div id="left-sidebar" class="span3 sidebar">
<div class="side-nav sidebar-block left-side-nav"> <div class="side-nav sidebar-block left-side-nav">
<ul><li><a href="/docs/"><strong>Documentation Home</strong></a></li></ul> <ul><li><a href="/docs/"><strong>Documentation Home</strong></a></li></ul>
{{ toctree(maxdepth=1) }} {{ toc }}
<hr />
<div class="qsButton pagination-centered" />
<a href="/quickstart"><button class="btn btn-primary" type="button">Quick Start Video</button></a>
</div>
</div> </div>
</div> </div>
{% endmacro %} {% endmacro %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment