Merge dfbe4c34745dee03a55a0430ed91b999e12dd9f3 into bdfa9823c8b1e25a5c822f6c719ec0e38ead7f71

This commit is contained in:
Rob Madole 2017-12-07 18:26:10 +00:00 committed by GitHub
commit 945de130d8
3 changed files with 15 additions and 1 deletions

View File

@ -11,7 +11,7 @@ Get started at http://fontawesome.io!
## License
- The Font Awesome font is licensed under the SIL OFL 1.1:
- http://scripts.sil.org/OFL
- Font Awesome CSS, LESS, and Sass files are licensed under the MIT License:
- Font Awesome and Font Awesome CDN CSS, LESS, Sass, and JavaScript files are licensed under the MIT License:
- https://opensource.org/licenses/mit-license.html
- The Font Awesome documentation is licensed under the CC BY 3.0 License:
- https://creativecommons.org/licenses/by/3.0/

View File

@ -45,6 +45,9 @@ fontawesome:
code:
version: MIT License
url: http://opensource.org/licenses/mit-license.html
cdn:
version: MIT License
url: http://opensource.org/licenses/mit-license.html
documentation:
version: CC BY 3.0
url: http://creativecommons.org/licenses/by/3.0/

View File

@ -56,6 +56,17 @@ relative_path: ../
</ul>
</section>
<section>
<h2 class="page-header">CDN License</h2>
<ul>
<li>
Applies to all CSS and JavaScript files served by cdn.fontawesome.com
</li>
<li>License: {{ site.fontawesome.license.cdn.version }}</li>
<li>URL: <a href="{{ site.fontawesome.license.cdn.url }}">{{ site.fontawesome.license.cdn.url }}</a></li>
</ul>
</section>
<section>
<h2 class="page-header">Documentation License</h2>
<ul>