|  | 4af97fd801 | Merge pull request 'development to main merge' (#52) from development into main Reviewed-on: #52 | 2024-05-10 13:24:59 +00:00 |  | 
			
				
					|  | 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 |  | 
			
				
					|  | 948d6c0de2 | Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid # Conflicts:
#	books/projectinca/SUMMARY.md
#	collections/tech/primitives/network/mycelium.md | 2024-05-09 17:11:35 +03:00 |  | 
			
				
					|  | 2eed0b65b7 | ... | 2024-05-09 17:09:00 +03:00 |  | 
			
				
					| 
							
							
								 Mik-TF | ba303b6e3e | legal update | 2024-05-08 20:07:47 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | b3f8ab18c2 | legal update | 2024-05-08 20:01:33 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | 2b94ca20ad | legal update | 2024-05-08 19:58:14 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | 4e41476b12 | removed manual legal in legal | 2024-05-08 19:57:06 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | 675d67d9fe | set manual legal as legal, since work is already done | 2024-05-08 19:37:54 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | 1b7b23d38c | removed new_mdbook, only useful for testers to buidl with the docs | 2024-05-08 19:33:15 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | f6f0e5a283 | updated test final | 2024-05-08 19:30:47 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | fc1d1eff0d | updated test with .collection | 2024-05-08 19:29:36 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | ff6b4e0f10 | updated test | 2024-05-08 19:28:12 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | 8dfcb96d91 | updated test | 2024-05-08 19:25:15 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | 515d640188 | updated test | 2024-05-08 19:23:39 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | cd381257dc | updated test summ | 2024-05-08 19:18:03 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | bf28bd296b | tech update core capabilities | 2024-05-08 16:12:17 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | 4691fc499f | tech update zos | 2024-05-08 16:08:23 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | 49b357d4e8 | tech update architecture | 2024-05-08 16:05:24 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | c29380aabd | tech update network wall | 2024-05-08 16:03:24 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | 5d8478bcea | tech update sumamry | 2024-05-08 16:01:25 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | 77f870df7f | tech update qsss | 2024-05-08 16:00:46 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | 26eec9bfa9 | tech update innovations | 2024-05-08 15:58:00 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | b54c5a0eba | tech update innovations | 2024-05-08 15:56:39 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | ddf616eef3 | tech update innovations | 2024-05-08 15:55:04 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | d46a3af9d0 | tech update re-invented | 2024-05-08 15:53:41 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | 26432d3009 | tech update intro | 2024-05-08 15:44:22 -04:00 |  | 
			
				
					| 
							
							
								 Mik-TF | a26e9d592b | tech update summary | 2024-05-08 15:35:41 -04:00 |  |