Merge branch 'master' into production

This commit is contained in:
Nabin Hait
2012-12-18 13:49:07 +05:30
41 changed files with 519 additions and 489 deletions

View File

@@ -59,7 +59,7 @@
<h4>Icons</h4>
<ul>
<li>The Noun Project</li>
<li>Glyphicons</li>
<li>Font Awesome: http://fortawesome.github.com/Font-Awesome</li>
</ul>
<h4>Web Frameworks</h4>