merge main_commsteam to main with fixed conflicts

This commit is contained in:
2024-04-10 18:54:49 +00:00
45 changed files with 463 additions and 398 deletions

View File

@@ -1,8 +1,7 @@
![alt text](governance.png)
# Governance
Governance is important to us, there is a wish from TF DMCC to outsource the operations and promotion to a cooperative and the community for which we suggest a combination of GEP, Guardians and a Cooperative
Community governance is important to us. TF DMCC is working to outsource the operations and promotion of the TF Grid with a community-led / cooperative approach. To achieve this, we are releasing a series of Grid Enhancement Proposals (GEPs), searching for a group of Guardians, and establishing the ThreeFold Cooperative.
## Planned for 3.14 (our next release)
@@ -12,5 +11,9 @@ Governance is important to us, there is a wish from TF DMCC to outsource the ope
## Treasury
<<<<<<< HEAD
This section needs to be filled in by the team.
=======
This section needs to be filled in by the team.
>>>>>>> main_commsteam