Mark Otto 3407ed948d resolved conflict		2011-09-10 21:06:09 -07:00
..
assets	overhaul docs CSS since it was scalable, converted docs mastheads and footers to classes and HTML5 elements, add masthead to js docs page but make it slate so it looks cool and stands out	2011-09-10 21:05:23 -07:00
index.html	resolved conflict	2011-09-10 21:06:09 -07:00
javascript.html	resolved conflict	2011-09-10 21:06:09 -07:00