development to main periodic update #102

Merged
mik-tf merged 51 commits from development into main 2024-06-14 16:52:01 +00:00
Showing only changes of commit 3b61487b83 - Show all commits

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'