Update history to reflect merge of #3212 [ci skip]

This commit is contained in:
Parker Moore
2014-12-17 19:00:57 -08:00
parent fe14434f8d
commit 63ed335463

View File

@@ -26,6 +26,7 @@
* Simplified platform detection in Gemfile example for Windows (#3177)
* Add the `jekyll-jalali` plugin added to the list of third-party plugins. (#3198)
* Add Table of Contents to Troubleshooting page (#3196)
* Add `inline_highlight` plugin to list of third-party plugins (#3212)
## 2.5.2 / 2014-11-17