Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2020-02-27 07:58:59 +08:00
commit d550de4560
2 changed files with 4 additions and 5 deletions

View file

@ -1,8 +1,7 @@
The Serpent application name and Serpent logo are licensed under a
Creative Commons Attribution license.
The Serpent logo is derived from "Sea Serpent"
by Lorc,
The Serpent logo is derived from "Sea Serpent" by Lorc,
licensed under the Creative Commons license CC-BY 3.0
Branding files are created by M. Straver and similarly released