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

Docs: Update footer in README.md and CONTRIBUTING.md

Browse source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2022-01-19 07:10:10 +01:00
parent 6d9aa5591d
commit a809720aae
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CONTRIBUTING.md
View file

@ -60,4 +60,4 @@ You can also contribute by...
----
*PhotoPrism® is a registered trademark. Our [Trademark and Brand Guidelines](https://photoprism.app/trademark), which may be updated from time to time, describe how our Brand Assets may be used. It is important to us that any permitted use of our Brand Assets is fair and meets the highest standards.*
*PhotoPrism® is a [registered trademark](https://photoprism.app/trademark). Docs [are available](https://github.com/photoprism/photoprism-docs) under the [CC BY-NC-SA 4.0 License](https://creativecommons.org/licenses/by-nc-sa/4.0/); [additional terms](https://github.com/photoprism/photoprism/blob/develop/assets/LICENSE) may apply. By using our software and services, you agree to our [terms & conditions](https://photoprism.app/terms).*

3
README.md
View file

@ -124,5 +124,4 @@ We welcome [contributions](CONTRIBUTING.md) of any kind, including blog posts, t
----
*PhotoPrism® is a registered trademark. Our [Trademark and Brand Guidelines](https://photoprism.app/trademark), which may be updated from time to time, describe how our Brand Assets may be used. It is important to us that any permitted use of our Brand Assets is fair and meets the highest standards.*
*PhotoPrism® is a [registered trademark](https://photoprism.app/trademark). Docs [are available](https://github.com/photoprism/photoprism-docs) under the [CC BY-NC-SA 4.0 License](https://creativecommons.org/licenses/by-nc-sa/4.0/); [additional terms](https://github.com/photoprism/photoprism/blob/develop/assets/LICENSE) may apply. By using our software and services, you agree to our [terms & conditions](https://photoprism.app/terms).*

24
assets/LICENSE
View file

@ -1,12 +1,20 @@
Michael Mayer and his legal successors hereby grant you a non-exclusive, non-transferable right
to use these assets as part of the official software distribution. Additional terms may apply.
Michael Mayer and his legal successors ("PhotoPrism") hereby grant you a non-exclusive,
non-transferable right to use these assets as part of the official software distribution.
Additional terms and conditions may apply. PhotoPrism® is a registered trademark.
Visit https://photoprism.app/trademark to learn more.
Unless you know specific assets were licensed under a permissive licence by the creator or copyright
holder, you are advised to ask before using them for your own private or commercial projects.
Documentation is available under the CC BY-NC-SA 4.0 License:
Visit https://docs.photoprism.app/credits/ for more information about images and other artwork.
https://creativecommons.org/licenses/by-nc-sa/4.0/
PhotoPrism® is a registered trademark. It is important to us that any permitted use is fair and
meets the highest standards.
By using our software and services, you agree to our terms & conditions:
Visit https://photoprism.app/trademark to read our trademark and brand guidelines.
https://photoprism.app/terms
If you are not aware that certain assets have been licensed under a permissive license by the
original author or copyright holder, you should check 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/