Mark Otto 707b362b80 Merge branch 'master' into docs-theme-toggler ...

Conflicts:
	docs/assets/css/docs.min.css

2014-05-20 23:27:40 -07:00

..

docs.css

Merge branch 'master' into docs-theme-toggler

2014-05-20 23:27:40 -07:00

pygments-manni.css

Fix #13138: use underscore prefix to ignore directories

2014-03-24 21:47:59 +01:00