Commit Graph

289 Commits

Author SHA1 Message Date
e12acb690e ... 2024-03-18 14:28:08 +02:00
f9674a74b9
... 2024-03-11 18:55:38 +03:00
0c957a170a
... 2024-03-10 17:05:09 +03:00
ab1fd48e6d
Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid
# Conflicts:
#	collections/def/3node.md
2024-03-10 16:37:42 +03:00
d4ed5126d6 ... 2024-03-10 13:50:14 +03:00
4a569faeea Merge branch 'main' of https://git.ourworld.tf/tfgrid/info_tfgrid 2024-03-07 16:12:58 +03:00
0967462500 ... 2024-03-07 16:12:51 +03:00
907de4d3d6
... 2024-03-01 04:48:25 +03:00
dcd88ab917
... 2024-02-29 06:22:31 +03:00
sasha-astiadi
239aeb73ac EDIT 2024-02-29 01:10:11 +03:00
sasha-astiadi
9e763343b6 EDIT : 2024-02-29 01:09:14 +03:00
e8b8794233 add missing files 2024-02-28 11:31:27 +01:00
7c3c7ef11d fix summary 2024-02-28 10:02:55 +01:00
6b7fdba1c5
... 2024-02-27 14:11:12 +03:00
59510c76cb
... 2024-02-27 07:23:38 +03:00
1671d307b4
... 2024-02-27 07:13:59 +03:00
69b183b4db
... 2024-02-27 07:11:11 +03:00
3d743fd2da
... 2024-02-23 16:07:35 +03:00
e100099146
... 2024-02-21 12:16:09 +03:00
881bc17ad3
dd 2024-02-20 14:03:57 +03:00
d2c37f5d8a
Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid 2024-02-20 06:39:56 +03:00
e4aae447c7
test 2024-02-20 06:39:26 +03:00
sasha-astiadi
3eddb2bc6a test 2024-02-14 14:59:48 +03:00
sasha-astiadi
eb9aa2df90 add missing file 2024-02-13 14:32:02 +03:00
sasha-astiadi
9dee081178 move file to the right dir 2024-02-13 14:31:34 +03:00
sasha-astiadi
3439077dac add missing files / fix 2024-02-13 14:31:11 +03:00
a87aa29bd8
... 2024-02-05 12:25:58 +03:00
2524d8ab5b
Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid
* 'main' of git.ourworld.tf:tfgrid/info_tfgrid:
  ...
  ...
  Update collections/tech/key_innovations.md
  ...
  images
  ...
  ...
  ...
  ...
  ...
  readme
  init
  Initial commit
2024-02-05 12:11:35 +03:00
738931370b
... 2024-02-05 12:11:20 +03:00
013c6f2046
... 2024-02-05 05:52:56 +03:00
20c23548e8
Merge branch 'main' of git.ourworld.tf:threefold_coop/info_threefold_coop 2024-02-02 08:33:37 +03:00
579b7dfdcb
... 2024-02-02 08:33:34 +03:00
cde6b1d79a Update collections/tech/key_innovations.md
adjusted typo
2024-02-02 04:55:51 +00:00
b6ac3cd284
... 2024-02-02 07:46:06 +03:00
3badd59c13
images 2024-01-28 09:10:28 +03:00
5b25f47527
... 2024-01-27 08:38:38 +03:00
efc9846cd5
... 2024-01-26 08:53:26 +03:00
41be107375
... 2024-01-26 07:04:37 +03:00
927884feb1
... 2024-01-26 06:06:57 +03:00