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

* 'master' of github.com:mojombo/jekyll:
  Update history to reflect merge of #1116
  Removed space characters in empty lines
This commit is contained in:
Parker Moore 2013-05-17 20:44:40 +02:00
commit fa1cbb7708
9 changed files with 27 additions and 26 deletions

View File

@ -3,6 +3,7 @@
### Minor Enhancements ### Minor Enhancements
* Move the building of related posts into their own class (#1057) * Move the building of related posts into their own class (#1057)
* Removed trailing spaces in several places throughout the code (#1116)
### Bug Fixes ### Bug Fixes
* Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue (#1106) * Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue (#1106)