mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-22 23:27:30 +09:00
Merge remote-tracking branch 'origin/master' into custom
This commit is contained in:
commit
d550de4560
2 changed files with 4 additions and 5 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
Please see the file ../toolkit/content/license.html for the copyright
|
Please see the file ../platform/toolkit/content/license.html for the
|
||||||
licensing conditions attached to this codebase, including copies of the
|
copyright licensing conditions attached to the platform codebase,
|
||||||
licenses concerned.
|
including copies of the licenses concerned.
|
||||||
|
|
||||||
You are not granted rights or licenses to the trademarks of Moonchild
|
You are not granted rights or licenses to the trademarks of Moonchild
|
||||||
Productions or any other party, including without limitation the
|
Productions or any other party, including without limitation the
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
The Serpent application name and Serpent logo are licensed under a
|
The Serpent application name and Serpent logo are licensed under a
|
||||||
Creative Commons Attribution license.
|
Creative Commons Attribution license.
|
||||||
|
|
||||||
The Serpent logo is derived from "Sea Serpent"
|
The Serpent logo is derived from "Sea Serpent" by Lorc,
|
||||||
by Lorc,
|
|
||||||
licensed under the Creative Commons license CC-BY 3.0
|
licensed under the Creative Commons license CC-BY 3.0
|
||||||
|
|
||||||
Branding files are created by M. Straver and similarly released
|
Branding files are created by M. Straver and similarly released
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue