Skip to content

Commit

Permalink
Merge pull request #697 from threefoldtech/development
Browse files Browse the repository at this point in the history
Dev to master update
  • Loading branch information
mik-tf authored Dec 2, 2024
2 parents 69f2040 + 6be55f7 commit d46a6c6
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/documentation/threefold_token/tft_bridges/tft_bridges.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ The following diagram shows the different bridges and ways to transfer ThreeFold
```mermaid
graph LR
A((TFChain-MainNet)) === id1(Stellar / TFChain MainNet Bridge) === B((Stellar Chain));
C((TFChain-TestNet)) === id2(Stellar / TFChain TestNet Bridge) === B((Stellar Chain));
A((TFChain-MainNet)) === id1(Stellar / TFChain Mainnet Bridge) === B((Stellar Chain));
C((TFChain-TestNet)) === id2(Stellar / TFChain Testnet Bridge) === B((Stellar Chain));
B((Stellar Chain)) === id3(Stellar / BSC Bridge) === E((Binance Smart Chain));
B((Stellar Chain)) === id4(Stellar / Eth Bridge) === D((Ethereum Chain));
Expand All @@ -35,11 +35,11 @@ The links to the bridges for TFT are the following:
* Stellar-BSC Bridge
* This bridge is accessible at the following link: [https://bridge.bsc.threefold.io/](https://bridge.bsc.threefold.io/)
* Read [this guide](./bsc_stellar_bridge.html) for more information
* The TFChain Main net Bridge
* This bridge is accessible on the ThreeFold Main Net Dashboard: [https://dashboard.grid.tf/](https://dashboard.grid.tf/).
* Stellar-TFChain Mainnet Bridge
* This bridge is accessible on the ThreeFold Mainnet Dashboard: [https://dashboard.grid.tf/](https://dashboard.grid.tf/).
* Read [this guide](./tfchain_stellar_bridge.html) for more information
* The TFChain Test net Bridge
* This bridge is accessible on the ThreeFold Test Net Dashboard: [https://dashboard.test.grid.tf/](https://dashboard.test.grid.tf/).
* Stellar-TFChain Testnet Bridge
* This bridge is accessible on the ThreeFold Testnet Dashboard: [https://dashboard.test.grid.tf/](https://dashboard.test.grid.tf/).
* Read [this guide](./tfchain_stellar_bridge.html) for more information

## Chains Functions
Expand Down
Binary file added src/knowledge_base/legal/img/legal_header.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/knowledge_base/legal/terms_conditions_all3.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Legal

<img src="./img/legal_header.jpg" alt="ThreeFold Legal Picture" style="border-radius: 10px;">

## TFGRID USER and/or FARMER TERMS AND CONDITIONS TFGRID 3.X

THESE TERMS AND CONDITIONS (THE "**AGREEMENTS**") CONSTITUTE A LEGAL AGREEMENT BETWEEN YOU (“TFGRID **USER**,"“TFGRID **FARMER**," “**YOU**", OR “**YOURS**”) AND TRC (“**THREEFOLD**”, “**COMPANY**,” “**US**,” “**WE**” OR “**OUR**”), GOVERNING THE TERMS OF YOUR PARTICIPATION AS A PARTNER, CUSTOMER, FARMER OR USER IN THE THREEFOLD GRID. YOU UNDERSTAND AND AGREE THAT BY ACCEPTING THE TERMS OF THIS AGREEMENT, EITHER BY CLICKING TO SIGNIFY ACCEPTANCE, OR BY TAKING ANY ONE OR MORE OF THE FOLLOWING ACTIONS DOWNLOADING, INSTALLING, RUNNING,/AND OR USING THE APPLICABLE SOFTWARE, YOU AGREE TO BE BOUND BY THE TERMS OF THIS AGREEMENT EFFECTIVE AS OF THE DATE THAT YOU TAKE THE EARLIEST OF ONE OF THE FOREGOING ACTIONS. YOU REPRESENT AND WARRANT THAT YOU ARE 18 YEARS OLD OR OLDER AND HAVE THE RIGHT AND AUTHORITY TO ENTER INTO AND COMPLY WITH THE TERMS OF THIS AGREEMENT.
Expand Down

0 comments on commit d46a6c6

Please sign in to comment.