Skip to content

Commit 5c5a0c3

Browse files
authored
Merge branch 'master' into patch-2
2 parents b8dde19 + c928f7b commit 5c5a0c3

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ GEM
8282
octokit (~> 4.0)
8383
public_suffix (~> 3.0)
8484
typhoeus (~> 1.3)
85-
html-pipeline (2.10.0)
85+
html-pipeline (2.11.0)
8686
activesupport (>= 2)
8787
nokogiri (>= 1.4)
8888
html-proofer (3.10.2)

notices.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ Content is copyright © Open Source Guides authors, released under [CC-BY-4.0](h
2222
Code, including source files and code samples if any in the content, is released under [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/), with the following exceptions:
2323

2424
* The primer components in `node_modules` are under the MIT license; see `LICENSE` in each component's directory
25-
* The [Octicons images](https://octicons.github.com) are under the [SIL OFL 1.1](https://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web)
25+
* The [Octicons images](https://octicons.github.com) are under the [SIL OFL 1.1](https://scripts.sil.org/ofl)
26+
2627

2728
This means you can use the code and content in this repository except for GitHub trademarks in your own projects. When using the GitHub logos, be sure to follow the [GitHub logo guidelines](https://github.com/logos).
2829

0 commit comments

Comments
 (0)