Update Readme and create new branch

Tribler / trustchain-superapp

Kotlin implementation of Trustchain and IPv8 with rich networking: multihoming of local Bluetooth+4G, decentral social networking, UDP hole punching, etc.

GNU General Public License v3.0

80 stars 63 forks source link

Update Readme and create new branch #112

Closed synctext closed 2 years ago

synctext commented 2 years ago

To resolve conflicts are a creating a new branch. The the commits by Euro iii team (merged) and Euro ii team (for this new branch) conflict.