Paulus Schoutsen a08459ec8f Merge branch 'jekyll-3' ...

Conflicts:
	.gitignore
	Gemfile.lock
	source/_components/media_player.plex.markdown
	source/_includes/site/head.html

2015-10-29 00:08:22 -07:00

..

footer.html

Update to site

2014-12-21 12:17:37 -08:00

head.html

Merge branch 'jekyll-3'

2015-10-29 00:08:22 -07:00

header.html

Update to site

2014-12-21 12:17:37 -08:00

hero_unit.html

Fix links in hero unit

2014-12-21 21:55:17 -08:00

navigation.html

Update to site

2014-12-21 12:17:37 -08:00

sidebar.html

Auto remove white space from component navigation

2015-10-29 00:04:26 -07:00