Merge pull request 'development_fix_tech' (#84) from development_fix_tech into development
Reviewed-on: #84
This commit is contained in:
commit
f5723135a0
@ -1 +1 @@
|
||||
!!wiki.include page:'vindo:vindo'
|
||||
!!wiki.include page:'vindo:vindo'
|
@ -1,18 +1,9 @@
|
||||
|
||||
<<<<<<< HEAD
|
||||
# Mycelium: Our Planetary Network as used in the TFGrid
|
||||
|
||||
# Mycelium: Our Planetary Network
|
||||
|
||||

|
||||
=======
|
||||
# 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.
|
||||
|
||||

|
||||
|
||||
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'
|
@ -18,4 +18,10 @@
|
||||
!!doctree.add
|
||||
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'
|
||||
|
||||
```
|
Loading…
Reference in New Issue
Block a user