development to main merge #52

Merged
mik-tf merged 23 commits from development into main 2024-05-10 13:25:00 +00:00

23 Commits

Author SHA1 Message Date
d69865804c Merge pull request 'development_kristof_merge' (#51) from development_kristof_merge into development
Reviewed-on: #51
2024-05-10 13:24:04 +00:00
Mik-TF
a72febb4b7 pinca, set main for book_collection 2024-05-10 09:22:56 -04:00
Mik-TF
cf88ba6198 pmycel, added governance intro 2024-05-10 09:21:26 -04:00
Mik-TF
3161118c28 pmycel, added info on layers 2024-05-10 09:19:38 -04:00
Mik-TF
4051544346 pmycel, added info on layers 2024-05-10 09:18:23 -04:00
Mik-TF
d1a5f3277e update pmycel hero farming 2024-05-10 08:56:18 -04:00
Mik-TF
079af46c82 update pmycel hero token and key 2024-05-10 08:47:03 -04:00
Mik-TF
e18964b149 update pmycel presentation 2024-05-10 08:38:12 -04:00
Mik-TF
0e81a1a3b9 update pmycel 2024-05-10 08:34:36 -04:00
Mik-TF
564f8558a1 update pmycel 2024-05-10 08:27:55 -04:00
Mik-TF
7c8a1e61a7 pinca update 2024-05-10 08:21:40 -04:00
Mik-TF
e5d8be13b0 updated pinca 2024-05-10 08:13:09 -04:00
Mik-TF
3aa8652dc8 moved blocks from engineering to marketplace 2024-05-10 07:58:03 -04:00
Mik-TF
3332b2151e put voting process in separate page 2024-05-10 07:48:26 -04:00
Mik-TF
119281c414 updated files grants, tokenomics 2024-05-10 07:44:40 -04:00
Mik-TF
6a702ece89 updated funding 2024-05-10 07:38:16 -04:00
Mik-TF
694ddded8d update tft.md 2024-05-10 07:35:58 -04:00
Mik-TF
3ec1aac2aa update summary tft 2024-05-10 07:32:41 -04:00
Mik-TF
77db527a94 update inca.md 2024-05-10 07:30:55 -04:00
Mik-TF
633be3807b update summary 2024-05-10 07:25:42 -04:00
Mik-TF
1359609419 set hero book to check new branch 2024-05-10 07:24:11 -04:00
Mik-TF
c67d5d9bee start kristof merge into dev 2024-05-10 07:20:39 -04:00
b932fe9e8b Merge pull request 'main into dev' (#50) from main into development
Reviewed-on: #50
2024-05-10 10:46:12 +00:00