development_fix_tech #84
| @@ -1,18 +1,9 @@ | |||||||
|  | # Mycelium: Our Planetary Network | ||||||
| <<<<<<< HEAD |  | ||||||
| # Mycelium: Our Planetary Network as used in the TFGrid |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
| ======= |  | ||||||
| # 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.  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
| 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' | ||||||
		Reference in New Issue
	
	Block a user