diff --git a/History.markdown b/History.markdown index 90ee65c0..10bfc158 100644 --- a/History.markdown +++ b/History.markdown @@ -101,6 +101,12 @@ * Add pubstorm deployment instructions to docs (#4881) * Corrected pagination docs for hidden: true feature (#4903) +## 3.1.5 / 2016-05-18 + +### Bug Fixes + + * Sort the results of the `require_all` glob (affects Linux only). (#4912) + ## 3.1.4 / 2016-05-18 ### Bug Fixes diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb index 61f613e6..9f900f15 100644 --- a/lib/jekyll/version.rb +++ b/lib/jekyll/version.rb @@ -1,3 +1,3 @@ module Jekyll - VERSION = '3.1.4' + VERSION = '3.1.5' end diff --git a/site/_docs/history.md b/site/_docs/history.md index f95224ab..0d079a4b 100644 --- a/site/_docs/history.md +++ b/site/_docs/history.md @@ -5,6 +5,15 @@ permalink: "/docs/history/" note: This file is autogenerated. Edit /History.markdown instead. --- +## 3.1.5 / 2016-05-18 +{: #v3-1-5} + +### Bug Fixes +{: #bug-fixes-v3-1-5} + +- Sort the results of the `require_all` glob (affects Linux only). ([#4912]({{ site.repository }}/issues/4912)) + + ## 3.1.4 / 2016-05-18 {: #v3-1-4} diff --git a/site/_posts/2016-05-18-jekyll-3-1-5-released.markdown b/site/_posts/2016-05-18-jekyll-3-1-5-released.markdown new file mode 100644 index 00000000..c341b37b --- /dev/null +++ b/site/_posts/2016-05-18-jekyll-3-1-5-released.markdown @@ -0,0 +1,17 @@ +--- +layout: news_item +title: 'Jekyll 3.1.5 Released' +date: 2016-05-18 21:35:27 -0700 +author: parkr +version: 3.1.5 +categories: [release] +--- + +There's always at least one bug, right? :) + +Hot on the trails of [v3.1.4](/news/2016/05/18/jekyll-3-1-4-released/), we +bring you v3.1.5! It fixes one bug around requiring the `ExcerptDrop`, +which only affects Linux. For the gory details, see [the pull +request for the fix](https://github.com/jekyll/jekyll/pull/4912). + +Happy Jekylling! diff --git a/site/latest_version.txt b/site/latest_version.txt index 0aec50e6..3ad0595a 100644 --- a/site/latest_version.txt +++ b/site/latest_version.txt @@ -1 +1 @@ -3.1.4 +3.1.5