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
..
css	Merge remote-tracking branch 'snide/master' into sticky-navigation	2014-01-07 17:53:02 -05:00
font	Update setup.py to work, rework file structure	2013-11-04 20:37:27 +11:00
js	Turning off sticky navigation if navbar is taller than window	2014-01-07 17:39:48 -05:00