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
..
asides	Markdown fixes	2015-10-28 23:00:29 -07:00
blog	Fix duplicate dates in articles	2015-10-28 21:56:35 -07:00
custom	Cleanup props	2015-10-28 23:45:40 -07:00
javascripts	Update to site	2014-12-21 12:17:37 -08:00
post	More fixes	2015-10-27 00:53:57 -07:00
site	Merge branch 'jekyll-3'	2015-10-29 00:08:22 -07:00
after_footer.html	Update to site	2014-12-21 12:17:37 -08:00
archive_post.html	Update to site	2014-12-21 12:17:37 -08:00
article.html	More fixes	2015-10-27 00:53:57 -07:00
aside.html	Update to site	2014-12-21 12:17:37 -08:00
disqus.html	Update to site	2014-12-21 12:17:37 -08:00
facebook_like.html	Update to site	2014-12-21 12:17:37 -08:00
footer.html	Update to site	2014-12-21 12:17:37 -08:00
google_analytics.html	Update to site	2014-12-21 12:17:37 -08:00
google_plus_one.html	Update to site	2014-12-21 12:17:37 -08:00
header.html	Update to site	2014-12-21 12:17:37 -08:00
navigation.html	Update to site	2014-12-21 12:17:37 -08:00
twitter_sharing.html	Update to site	2014-12-21 12:17:37 -08:00
unused_head.html	Update to site	2014-12-21 12:17:37 -08:00