luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update Digital Assets License

Browse source 
Clarify redistribution terms.
This commit is contained in:
Michael Mayer 2022-01-19 18:02:12 +01:00
parent 0528a6541b
commit 2fe663e257
2 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
LICENSE
View file

@ -677,7 +677,7 @@ Michael Mayer and his legal successors („PhotoPrism“) hereby grant you a non
non-transferable right to use the Digital Assets included in the software, source code,
and related documentation — such as images, icons, vector graphics, fonts, videos, sounds,
models, and example files („Digital Assets“) — as part of the Official Software Distribution,
unless otherwise noted.
unless otherwise noted. Please ask for written permission to redistribute.
PhotoPrism’s Brand Assets — including trademarks, logos, icons, designs, fonts, products,
services, and any other brand features and elements, whether registered or unregistered
@ -689,13 +689,11 @@ manner:
https://photoprism.app/trademark
Because some Digital Assets are licensed by us for use in the Official Software Distribution,
we cannot redistribute them under a permissive license for other purposes. If the original
author or copyright holder has not released them under a permissive license, you must
obtain a license before using them in your own work, whether commercial or non-commercial
in nature. A big thank you to everyone who made this possible:
https://docs.photoprism.app/credits/
Because some Digital Assets are licensed to us only for direct distribution, we cannot
redistribute them under a more permissive license for other purposes. If the author or
copyright holder has not released them under a permissive license, you must obtain a
license before using them in your own work, whether commercial or non-commercial in
nature.
The names of authors, copyright holders, and contributors may NOT be used to promote any
products or services without their prior written permission.

14
assets/LICENSE
View file

@ -5,7 +5,7 @@ Michael Mayer and his legal successors („PhotoPrism“) hereby grant you a non
non-transferable right to use the Digital Assets included in the software, source code,
and related documentation — such as images, icons, vector graphics, fonts, videos, sounds,
models, and example files („Digital Assets“) — as part of the Official Software Distribution,
unless otherwise noted.
unless otherwise noted. Please ask for written permission to redistribute.
PhotoPrism’s Brand Assets — including trademarks, logos, icons, designs, fonts, products,
services, and any other brand features and elements, whether registered or unregistered
@ -17,13 +17,11 @@ manner:
https://photoprism.app/trademark
Because some Digital Assets are licensed by us for use in the Official Software Distribution,
we cannot redistribute them under a permissive license for other purposes. If the original
author or copyright holder has not released them under a permissive license, you must
obtain a license before using them in your own work, whether commercial or non-commercial
in nature. A big thank you to everyone who made this possible:
https://docs.photoprism.app/credits/
Because some Digital Assets are licensed to us only for direct distribution, we cannot
redistribute them under a more permissive license for other purposes. If the author or
copyright holder has not released them under a permissive license, you must obtain a
license before using them in your own work, whether commercial or non-commercial in
nature.
The names of authors, copyright holders, and contributors may NOT be used to promote any
products or services without their prior written permission.