Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/github/pages-gem
Browse files Browse the repository at this point in the history
# Conflicts:
#	lib/github-pages/version.rb
  • Loading branch information
sskylar committed Mar 28, 2017
2 parents 3d9ccf1 + bda1c45 commit ea18621
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/github-pages/dependencies.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class Dependencies
"jekyll-optional-front-matter" => "0.1.2",
"jekyll-readme-index" => "0.1.0",
"jekyll-default-layout" => "0.1.4",
"jekyll-titles-from-headings" => "0.1.4",
"jekyll-titles-from-headings" => "0.1.5",

# Pin listen because it's broken on 2.1 & that's what we recommend.
# https://github.com/guard/listen/pull/371
Expand Down
2 changes: 1 addition & 1 deletion lib/github-pages/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true
module GitHubPages
VERSION = 131
VERSION = 132
.to_s + '-siteleaf'.freeze
end

0 comments on commit ea18621

Please sign in to comment.