Merge branch 'master' of https://github.com/woodwardjd/octopress into woodwardjd-master

This commit is contained in:
Brandon Mathis
2011-07-29 20:50:35 -04:00
3 changed files with 62 additions and 4 deletions

View File

@ -1,4 +1 @@
{% include asides/recent_posts.html %}
{% include asides/twitter.html %}
{% include asides/delicious.html %}
{% include asides/pinboard.html %}
{% include_array asides %}