Eric Hough 9b26927f5d Merge remote-tracking branch 'snide/master' into sticky-navigation ... Conflicts: sphinx_rtd_theme/static/css/theme.css		2014-01-07 17:53:02 -05:00
..
badge_only.css	don't use box-sixing here. It can hijacks native css. Fixes	2013-11-05 13:20:23 -08:00
theme.css	Merge remote-tracking branch 'snide/master' into sticky-navigation	2014-01-07 17:53:02 -05:00