Parker Moore d33f45ff05 Merge branch 'master' of github.com:mojombo/jekyll ...

* 'master' of github.com:mojombo/jekyll:
  Print deprecation warnings for 'server', 'watch' and 'auto' when loaded from files. Fixes #972
  Fixes multiple config loading. Closes #973. Rel: #945.

2013-04-15 00:32:17 +02:00

..

jekyll

Merge branch 'master' of github.com:mojombo/jekyll

2013-04-15 00:32:17 +02:00

site_template

move template site to default markdown renderer

2013-04-13 12:41:03 -04:00

jekyll.rb

Merge pull request #959 from mojombo/deprecator

2013-04-14 11:05:07 -07:00