Merge branch 'patch-1' of git://github.com/nbashaw/free-programming-books into nbashaw-patch-1

Conflicts: free-programming-books.md
11 years ago · 050cad286c
parent 7d7ac0c706 730c69f3aa
commit 050cad286c
1 changed files with 1 additions and 0 deletions
--- a/free-programming-books.md
+++ b/free-programming-books.md
@ -335,6 +335,7 @@
 ###HTML / CSS

 * [Dive Into HTML5](http://fortuito.us/diveintohtml5/)
+* [GA Dash](http://dash.generalassemb.ly)
 * [HTML Dog Tutorials](http://www.htmldog.com/)
 * [HTML5 Canvas] (http://chimera.labs.oreilly.com/books/1234000001654/index.html) - Steve Fulton & Jeff Fulton
 * [HTML5 for Publishers] (http://chimera.labs.oreilly.com/books/1234000000770/index.html) - Sanders Kleinfeld