Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Merlin Patterson (they/them) authored Mar 25, 2019
2 parents e936034 + 0023d5e commit 1ad55f2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@ notifications:
email: false

cache: bundler
sudo: false
2 changes: 1 addition & 1 deletion lib/github-pages/dependencies.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class Dependencies
"listen" => "3.1.5",

# Pin activesupport because 5.0 is broken on 2.1
"activesupport" => "4.2.10",
"activesupport" => "4.2.11.1",
}.freeze

# Jekyll and related dependency versions as used by GitHub Pages.
Expand Down

0 comments on commit 1ad55f2

Please sign in to comment.