diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-03 09:37:50 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-03 09:37:52 +0200 |
| commit | 7bf37e19d234d15547549ec59635230906d0304f (patch) | |
| tree | 7e0e3cea8190f7eb19a95ffade9f4feafeae73d1 | |
| parent | afc60de4164dc723f9010da7f3867f8354f81530 (diff) | |
| parent | dae0a89d4b66f08c83ccc8c20cf37521084b6257 (diff) | |
| download | bitcoin-7bf37e19d234d15547549ec59635230906d0304f.tar.xz | |
Merge pull request #6369
dae0a89 assets-attribution: Update typicons to MIT license (Luke Dashjr)
| -rw-r--r-- | doc/assets-attribution.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/assets-attribution.md b/doc/assets-attribution.md index ebba64a61a..c6da1a4586 100644 --- a/doc/assets-attribution.md +++ b/doc/assets-attribution.md @@ -6,7 +6,7 @@ The following is a list of assets used in the bitcoin source and their proper at ### Info * Icon Pack: Typicons (http://typicons.com) * Designer: Stephen Hutchings (and more) -* License: CC BY-SA +* License: MIT * Site: [https://github.com/stephenhutchings/typicons.font](https://github.com/stephenhutchings/typicons.font) ### Assets Used @@ -30,7 +30,7 @@ Jonas Schnelli ### Info * Designer: Jonas Schnelli * Bitcoin Icon: (based on the original bitcoin logo from Bitboy) -* Some icons are based on Stephan Hutchings Typicons (these are under CC BY-SA license) +* Some icons are based on Stephan Hutchings Typicons * License: MIT ### Assets Used |