Compare commits

...

14 Commits

Author SHA1 Message Date
86827c23db Merge branch 'development' of git.ourworld.tf:tfgrid/info_tfgrid into development
* 'development' of git.ourworld.tf:tfgrid/info_tfgrid:
  s
2024-07-29 10:05:56 +02:00
23cb055f8c Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid 2024-07-28 10:35:17 +02:00
b0a6115e80 Merge pull request 'development to main' (#129) from development into main
Reviewed-on: #129
2024-07-15 17:49:56 +00:00
c9e75c21dc Merge pull request 'development to main' (#127) from development into main
Reviewed-on: #127
2024-07-14 01:37:30 +00:00
9f827d4f58 Merge pull request 'development to main' (#125) from development into main
Reviewed-on: #125
2024-07-11 21:12:37 +00:00
06039ac195 Merge pull request 'development to main periodic update' (#122) from development into main
Reviewed-on: #122
2024-07-11 01:45:09 +00:00
9a7d968268 Merge branch 'development'
* development:
  tokens
2024-07-08 06:20:24 +02:00
ba5cc1b4a9 Merge branch 'development'
* development:
  Update docs_projectinca/README.md
  updated whitepaper
  set whitepaper as test
  s
  s
  s
2024-07-07 10:37:35 +02:00
7d970ac415 Merge pull request 'development to main' (#110) from development into main
Reviewed-on: #110
2024-06-20 13:52:31 +00:00
e4eaa9dfdd Merge pull request 'development to main periodic update' (#108) from development into main
Reviewed-on: #108
2024-06-19 17:27:32 +00:00
60134e79b9 Merge pull request 'development to main periodic update' (#102) from development into main
Reviewed-on: #102
2024-06-14 16:52:01 +00:00
59c8c0361c Merge pull request 'Fix tech' (#82) from dev_mik into main
Reviewed-on: #82
2024-05-16 17:21:23 +00:00
Mik-TF
3e0d1cb1e4 refixed stuff that should be fixed 2024-05-16 13:20:00 -04:00
Mik-TF
cf2065cc07 tech updated mycelium 2024-05-16 13:19:52 -04:00

Diff Content Not Available