Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
2 parents ce592c2 + 0935def commit 4fbcc70ad524c8e0cd91ba846a676eea68480271 @codylindley committed Oct 9, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 README.md
View
@@ -239,7 +239,7 @@ An opinionated list of tools for frontend (i.e. html, js, css) desktop/laptop (i
######Full Stack Application Frameworks
* [tower.js](http://towerjs.org/) (requires NodeJS)
* [wakanda](http://www.wakanda.org/)
-* [meteor](http://http://www.meteor.com/)
+* [meteor](http://www.meteor.com/)
---
@@ -321,7 +321,7 @@ An opinionated list of tools for frontend (i.e. html, js, css) desktop/laptop (i
######CSS Style/Conventions Guides
* [kss](https://github.com/kneath/kss#readme)
-* [SMACCS](http://smacss.com/)
+* [SMACSS](http://smacss.com/)
* [Google HTML/CSS Style Guide](http://google-styleguide.googlecode.com/svn/trunk/htmlcssguide.xml#Declaration_order)
* [idiomatic-css](https://github.com/necolas/idiomatic-css)
* [Object-Oriented CSS](http://oocss.org/)

0 comments on commit 4fbcc70

Please sign in to comment.