Parker Moore 82f32d5c02 Merge configuration properly. Closes #978.		2013-04-16 00:41:10 +02:00
..
jekyll	Merge configuration properly. Closes #978.	2013-04-16 00:41:10 +02:00
site_template	move template site to default markdown renderer	2013-04-13 12:41:03 -04:00
jekyll.rb	Jekyll.set_timezone accepts just the timezone, not the config	2013-04-15 15:39:36 +02:00