Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@codylindley
codylindley committed Jan 15, 2013
2 parents 79341e7 + 0c65afe commit a71115b
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion README.md
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ An opinionated list of tools for frontend (i.e. html, js, css) desktop/laptop (i


--- ---


######Test Runner's ######Test Runners


* [testem](https://github.com/airportyh/testem) * [testem](https://github.com/airportyh/testem)
* [testacular](http://vojtajina.github.com/testacular/) * [testacular](http://vojtajina.github.com/testacular/)
Expand Down Expand Up @@ -264,6 +264,8 @@ An opinionated list of tools for frontend (i.e. html, js, css) desktop/laptop (i
######Languages Compliling to HTML ######Languages Compliling to HTML
* [jade](http://jade-lang.com/) * [jade](http://jade-lang.com/)
* [haml](https://github.com/haml/haml) * [haml](https://github.com/haml/haml)
* [markdown](http://daringfireball.net/projects/markdown/)
* [slim](http://slim-lang.com/)


--- ---


Expand Down

0 comments on commit a71115b

Please sign in to comment.