Tom Preston-Werner 202894c196 Merge branch 'custom-layout-directory' of https://github.com/tombell/jekyll into tombell-custom-layout-directory ... Conflicts: lib/jekyll/site.rb		2012-06-11 15:40:22 -07:00
..
jekyll	Merge branch 'custom-layout-directory' of https://github.com/tombell/jekyll into tombell-custom-layout-directory	2012-06-11 15:40:22 -07:00
jekyll.rb	Allow a custom 'layouts' directory	2012-05-30 21:39:43 -04:00