Merge branch 'source' of github.com:wona/wona.github.com into source

Conflicts:
	sass/custom/_styles.scss
	source/_includes/custom/navigation.html
This commit is contained in:
wona
2012-10-20 14:55:00 +05:30
4 changed files with 17 additions and 6 deletions

View File

@ -2,6 +2,6 @@
<li><a href="{{ root_url }}/">Blog</a></li>
<li><a href="{{ root_url }}/blog/archives">Post Index</a></li>
<li><a href="{{ root_url }}/blog/index">Magazine Archives</a></li>
<li><a id="new" href="{{ root_url }}/blog/internship">Internships</a></li>
<li><a href="{{ root_url }}/blog/internship">Internship</a></li>
</ul>