Merge pull request 'Fix tech' (#82) from dev_mik into main

Reviewed-on: #82
This commit is contained in:
mik-tf 2024-05-16 17:21:23 +00:00
commit 59c8c0361c
3 changed files with 8 additions and 11 deletions

View File

@ -1,18 +1,9 @@
# Mycelium: Our Planetary Network
<<<<<<< HEAD
# Mycelium: Our Planetary Network as used in the TFGrid
![alt text](img/mycelium.png) ![alt text](img/mycelium.png)
=======
# Mycelium: Our Planetary Network
The planetary network called Mycelium is an overlay network which lives on top of the existing Internet or other peer-to-peer networks created. The planetary network called Mycelium is an overlay network which lives on top of the existing Internet or other peer-to-peer networks created.
![](img/planet_net_.jpg)
In the Mycelium network, everyone is connected to everyone. End-to-end encryption between users of an app and the app runs behind the network wall. In the Mycelium network, everyone is connected to everyone. End-to-end encryption between users of an app and the app runs behind the network wall.
>>>>>>> ba303b6e3eb8220bf2851a949db109e68ccd1f8c
!!wiki.include page:'tech:mycelium_incl.md' !!wiki.include page:'tech:mycelium_incl.md'

View File

@ -18,4 +18,10 @@
!!doctree.add !!doctree.add
url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/partners_utilization' url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/partners_utilization'
!!doctree.add
url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/vindo'
!!doctree.add
url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/mkondo'
``` ```