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,4 +1,3 @@
<h1> TFGrid 3.14 Farming Updates </h1>
<h2>Table of Contents</h2>
@@ -101,4 +100,4 @@ This GEP can be done once voting system has been changed and GEP 1, 2 and 3 are
We highly encourage everyone to discuss on the forum about this exciting phase of the ThreeFold adventure.
Please share your thoughts and feedback on the ongoing forum post [here](https://forum.threefold.io/t/feedback-on-farming-logic-as-suggested-for-tfgrid-3-14/4275).
Please share your thoughts and feedback on the ongoing forum post [here](https://forum.threefold.io/t/feedback-on-farming-logic-as-suggested-for-tfgrid-3-14/4275).