development to main #47

Merged
mik-tf merged 47 commits from development into main 2024-05-03 12:30:46 +00:00
2 changed files with 4 additions and 2 deletions
Showing only changes of commit dc29cd5a16 - Show all commits

View File

@ -1 +1 @@
These Terms and Conditions (the "**Agreement**") constitute a legal agreement between you (“**user**," “**you**", or “**yours**”) and [THREEFOLD RELATED COMPANIES](../../about/threefold_companies.md) (“**Threefold**”, “**Company**,” “**us**,” “**we**” or “**our**”)
These Terms and Conditions (the "**Agreement**") constitute a legal agreement between you ("**user**," "**you**", or "**yours**") and [THREEFOLD RELATED COMPANIES](../../about/threefold_companies.md) ("**Threefold**", "**Company**," "**us**,” "**we**" or "**our**")

View File

@ -1,6 +1,8 @@
**USER TERMS AND CONDITIONS**
!!wiki.include page:'manual_legal:parties_threefold.md', governing your usage of the ThreeFold software and related products (the “**TF Products**”), including but not limited to:
!!wiki.include page:'manual_legal:parties_threefold.md'
, governing your usage of the ThreeFold software and related products (the “**TF Products**”), including but not limited to:
- The ThreeFold software and technologies (the "**Software**"), including:
- "**Zero OS**", a stateless operating system which enables distributed hardware to form the ThreeFold_Grid which generates IT Capacity (storage and compute capacity)