Update history to reflect merge of #3438 [ci skip]
Merge pull request #3438 from jordanthornquest/master
Fix broken link in resources `jordanthornque.st` should be `jordanthornquest.com`. That's been remedied!
Update history to reflect merge of #3436 [ci skip]
Merge pull request #3436 from jekyll/fix-highlight-madness
highlight: duplicate tests for pygments for rouge Ensure that the output we get for pygments will match that we get for rouge in all cases except line numbers.
highlight: fix problem with linenos and rouge. Found by @EdMcBane in https://github.com/jekyll/jekyll/pull/3435 The strange regexp we were doing to replace thebits in the Pygments output were wreaking havoc on Rouge output because Rouge uses's to wrap line numbers. To be consistent, the output from render_* should *not* include the wrappingandtags. It should just be what was inside. We can then wrap it in our own custom tags without using any regular expressions, as God intended. Death to regular expressions and HTML manipulation!
Update history to reflect merge of #3401 [ci skip]
Merge pull request #3401 from jekyll/fix-code-cleanup
Update history to reflect merge of #3431 [ci skip]
Merge pull request #3431 from Ezmyrelda/patch-1
Formatting adjustment Deletion of a dash - between last entry of Tags and beginning of Collections.
Add the omitted 'team'. [ci skip] :top_hat:/t @kleinfreund https://github.com/jekyll/jekyll/commit/ea9b959c23dda84362455dbc5667c72ebb7c230f#commitcomment-9639789
Use 3 places to the right of the decimal place instead of 2.
Update history to reflect merge of #3415 [ci skip]