jekyll/lib
Lucas Jenss 2ac98a7358 Merge branch 'master' into permalink-special-characters
Conflicts:
	lib/jekyll/page.rb
	lib/jekyll/post.rb
2013-07-14 23:58:22 +02:00
..
jekyll Merge branch 'master' into permalink-special-characters 2013-07-14 23:58:22 +02:00
site_template Default Markdown template parser for new sites to RedCarpet via _config.yml. Related: #1236. 2013-06-27 18:57:17 +02:00
jekyll.rb Merge branch 'master' into permalink-special-characters 2013-07-14 23:58:22 +02:00