Fabio Niephaus 2812341c37 Merge branch 'master' of https://github.com/jekyll/jekyll into _includes ... Conflicts: bin/jekyll		2015-08-09 16:22:33 +01:00
..
jekyll	Merge branch 'master' of https://github.com/jekyll/jekyll into _includes	2015-08-09 16:22:33 +01:00
site_template	Merge pull request #3838 from gynter/issue-3836	2015-07-28 11:29:01 -07:00
jekyll.rb	Liquid profiler	2015-06-07 16:38:05 +00:00