Commit Graph

777 Commits

Author SHA1 Message Date
d84487b79d s 2024-09-09 07:19:25 +02:00
a961c63f16 Merge branch 'development' of git.ourworld.tf:tfgrid/info_tfgrid into development 2024-09-01 06:10:24 +02:00
6a35f7eb85 s 2024-09-01 06:10:23 +02:00
1540effde3 Merge pull request 'fixed' (#142) from development_fix_quick into development
Reviewed-on: #142
2024-08-29 23:29:11 +00:00
mik-tf
ea27326ae4 fixed 2024-08-29 19:28:46 -04:00
e16b01f7d4 Merge pull request 'finalized info_fgrid sync' (#141) from development_final_sync into development
Reviewed-on: #141
2024-08-29 23:23:44 +00:00
mik-tf
0c33119601 finalized info_fgrid sync 2024-08-29 19:22:26 -04:00
a75e59d42c Merge pull request 'updated sync with info_grid' (#140) from development_update_new into development
Reviewed-on: #140
2024-08-29 22:15:43 +00:00
mik-tf
4b44fa1664 updated sync with info_grid 2024-08-29 18:15:05 -04:00
ca9288af82 Merge pull request 'troubleshootinfg farming' (#139) from development_trouble into development
Reviewed-on: #139
2024-08-29 21:24:42 +00:00
mik-tf
350531c668 troubleshootinfg farming 2024-08-29 17:23:40 -04:00
544dacad02 Merge pull request 'development_update' (#138) from development_update into development
Reviewed-on: #138
2024-08-29 20:46:21 +00:00
mik-tf
7567164929 update 2024-08-29 16:45:52 -04:00
mik-tf
b7e3f2b323 updated faq, tft 2024-08-29 16:43:43 -04:00
ec47399867 Merge pull request 'development_update_from_0133' (#137) from development_update_from_0133 into development
Reviewed-on: #137
2024-08-29 20:14:58 +00:00
mik-tf
516c036a46 updated 0133 2024-08-29 16:14:09 -04:00
mik-tf
811493e9b0 updated 0133 2024-08-29 16:10:38 -04:00
372ba64e4e Update collections/projectinca/stories/stories.md 2024-08-29 20:00:51 +00:00
260fcfeb16 collection update 2024-08-29 19:50:49 +00:00
9b2cda9e8e update 2024-08-26 11:14:18 +02:00
972d0e48a9 Merge pull request 'decentralization update project inca' (#136) from development_dec2 into development
Reviewed-on: #136
2024-08-20 15:49:55 +00:00
Mik-TF
2fe3773aac decentralization update project inca 2024-08-20 11:49:01 -04:00
79bec3ec39 Merge pull request 'decentralization update project inca' (#135) from development_dec into development
Reviewed-on: #135
2024-08-20 15:45:40 +00:00
Mik-TF
a8be8ff612 decentralization update project inca 2024-08-20 11:45:03 -04:00
b7f845a4cf Merge pull request 'updated liquidity' (#134) from development_liquidity into development
Reviewed-on: #134
2024-08-20 14:50:04 +00:00
Mik-TF
ffbe65714a updated liquidity 2024-08-20 10:49:25 -04:00
1f743cd15f Merge pull request 'updated intro and tokenomics for projectinca' (#133) from development_new into development
Reviewed-on: #133
2024-08-19 22:11:30 +00:00
Mik-TF
5de7e3180d updated intro and tokenomics for projectinca 2024-08-19 18:06:22 -04:00
b5d155d00b Merge pull request 'updated intro first part of project inca' (#132) from development_update_intro into development
Reviewed-on: #132
2024-08-19 20:31:15 +00:00
Mik-TF
2c1e878d9c updated intro first part of project inca 2024-08-19 16:29:07 -04:00
17efd5f8e1 Merge pull request 'added info for first page projectinca' (#131) from development_update2 into development
Reviewed-on: #131
2024-08-19 19:38:39 +00:00
Mik-TF
ec07a2d4d3 Merge branch 'development' into development_update2
merge dev
2024-08-19 15:37:21 -04:00
3c0082a005 ... 2024-08-17 13:22:25 +02:00
Mik-TF
416d03381e added info for first page projectinca 2024-08-16 12:18:43 -04:00
d93f748bfb s 2024-08-16 14:04:37 +02:00
564345e26b s 2024-08-16 01:40:17 +02:00
da14091106 s 2024-08-06 17:33:59 +02:00
6e1f478ce5 :wq
Merge branch 'development' of git.ourworld.tf:tfgrid/info_tfgrid into development
2024-08-01 18:45:50 +02:00
0f08c2ec63 ... 2024-08-01 18:45:49 +02:00
c57b71cd76 Update collections/dy_intro/dunia_yetu/dunia_yetu.md 2024-08-01 15:17:04 +00:00
dc244fbe55 Update collections/dy_intro/dunia_yetu/dunia_yetu.md 2024-08-01 14:58:29 +00:00
393985d305 ... 2024-07-29 10:27:54 +02:00
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
11fcf9e804 s 2024-07-28 08:41:44 +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
77094a835b Merge pull request 'removed docs_inca, transferred to new repo' (#128) from development_remove_docs_inca into development
Reviewed-on: #128
2024-07-15 17:49:36 +00:00
Mik-TF
c431559405 removed docs_inca, transferred to new repo 2024-07-15 13:48:41 -04:00
c9e75c21dc Merge pull request 'development to main' (#127) from development into main
Reviewed-on: #127
2024-07-14 01:37:30 +00:00
4ed8102c8a Merge pull request 'finished files for tfgrid4specs' (#126) from development_gridspecs into development
Reviewed-on: #126
2024-07-14 01:37:11 +00:00