Commit 9421f0af authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch 'master' into docs_derp

Conflicts:
	docs/_layouts/default.html
	docs/_layouts/home.html
parents 3e54be9a 5b7f508c
Showing with 4 additions and 2 deletions
+4 -2
......@@ -10,6 +10,10 @@
<ul class="footer-links muted">
<li>Currently v{{ site.current_version }}</li>
<li>&middot;</li>
<li><a href="{{ site.repo }}">GitHub</a></li>
<li>&middot;</li>
<li><a href="{{ site.baseurl }}getting-started/#examples">Examples</a></li>
<li>&middot;</li>
<li><a href="{{ page.base_url }}2.3.2/">v2.3.2 docs</a></li>
<li>&middot;</li>
<li><a href="{{ page.base_url }}about/">About</a></li>
......@@ -17,8 +21,6 @@
<li><a href="{{ site.expo }}">Expo</a></li>
<li>&middot;</li>
<li><a href="{{ site.blog }}">Blog</a></li>
<li>&middot;</li>
<li><a href="{{ site.repo }}">GitHub</a></li>
</ul>
</div>
</footer>
......
Supports Markdown
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