tfgrid/info_tfgrid
33
3
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Activity

main into dev #50

Merged
mik-tf merged 64 commits from main into development 2024-05-10 10:46:13 +00:00
Conversation 0 Commits 64 Files Changed 325 +866 -1231
mik-tf commented 2024-05-10 10:40:17 +00:00
Owner
Copy Link

Situation

We want to have development updated with kristof branch, and other branches. We start by merging main into dev so dev is up to date.

# Situation We want to have development updated with kristof branch, and other branches. We start by merging main into dev so dev is up to date.
mik-tf added 64 commits 2024-05-10 10:40:17 +00:00
Merge pull request 'development to main' (#47) from development into main 743f8b40d7 
Reviewed-on: #47
updated manual with main branch c5c809703d
removed unused books 2ebbbee4ff
manual update intro.md c1b32cc283
Update collections/projectinca/intro.md 2b1d0dc54c
Update collections/bestkeptsecret/lets_have_fun.md aeef7969a3
Update collections/bestkeptsecret/lets_have_fun.md a4c685be53
fixed typos in pinca 2d8aa5dd30
tfgrid3 updates 954e2f0548
tfgrid3 updates 2491eb1740
tfgrid3 updates 9fa59f9cb0
tfgrid3 updates 2a2cb91a8c
tfgrid4 updates ea2792d207
tfgrid4 updates e5e46ba405
tfgrid4 updates 87255142b8
tfgrid4 updates 86e53c5999
tfgrid4 updates e7e08e1b33
tfgrid4 updates f2e9e4e9ec
tfgrid4 updates bb60ef0c5f
updated tfgrid4 summary 8db00c0242
updated tfgrid4 home cf4e012b8e
updated tfgrid4 home b4992efe45
updated tfgrid4 home dd526eda97
updated tfgrid4 home 5b119f1577
updated tfgrid4 home 02655c2b21
tfgrid4 added back farming for v4 files 3a2c254bce
tfgrid4 added economy as inca_fuel 6c1c84e997
tfgrid4 economy update fea38b4e5c
tfgrid4 economy update eb0ab69c58
tfgrid4 economy update a5a70cf562
tfgrid4 tech update abcbef52e7
tfgrid4 values update b2514cd3be
tfgrid4 problems update 8b72e33f4c
tfgrid4 update home d72e6f53ca
tfgrid4 update home 9e7d698aee
tfgrid4 update farming 74038afb0d
tech update title ea2e27a9c2
updated summaries to introduction not intro f8025b3994
tech update summary a26e9d592b
tech update intro 26432d3009
tech update re-invented d46a3af9d0
tech update innovations ddf616eef3
tech update innovations b54c5a0eba
tech update innovations 26eec9bfa9
tech update qsss 77f870df7f
tech update sumamry 5d8478bcea
tech update network wall c29380aabd
tech update architecture 49b357d4e8
tech update zos 4691fc499f
tech update core capabilities bf28bd296b
updated test summ cd381257dc
updated test 515d640188
updated test 8dfcb96d91
updated test ff6b4e0f10
updated test with .collection fc1d1eff0d
updated test final f6f0e5a283
removed new_mdbook, only useful for testers to buidl with the docs 1b7b23d38c
set manual legal as legal, since work is already done 675d67d9fe
removed manual legal in legal 4e41476b12
legal update 2b94ca20ad
legal update b3f8ab18c2
legal update ba303b6e3e
... 2eed0b65b7
Merge branch 'main' of git.ourworld.tf:tfgrid/info_tfgrid 948d6c0de2 
# Conflicts:
#	books/projectinca/SUMMARY.md
#	collections/tech/primitives/network/mycelium.md
mik-tf merged commit b932fe9e8b into development 2024-05-10 10:46:13 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
Kind/Breaking
Breaking change that won't be backward compatible
Kind/Bug
Something is not working
Kind/Documentation
Documentation changes
Kind/Enhancement
Improve existing functionality
Kind/Feature
New functionality
Kind/Security
This is security issue
Kind/Testing
Issue or pull request related to testing
Priority
Critical
The priority is critical
Priority
High
The priority is high
Priority
Low
The priority is low
Priority
Medium
The priority is medium
Reviewed
Confirmed
Issue has been confirmed
Reviewed
Duplicate
This issue or pull request already exists
Reviewed
Invalid
Invalid issue
Reviewed
Won't Fix
This issue won't be fixed
Status
Abandoned
Somebody has started to work on this but abandoned work
Status
Blocked
Something is blocking this issue or pull request
Status
Need More Info
Feedback is required to reproduce issue or to continue work
Defect
Feedback
Question
Roadmap
Story
Urgent
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
Alexhannelas Amanda ashraf Cameron dan delandtj despiegk ehab emre Florian gosam Karoline888 lee mariobassem marionrvrn maximevanhees maxux mik-tf PeterNashaat RobertJan sabrinasadik sachaobg samaradel sashaastiadi scott Shang4you Sherwint thabeta timur yadalamy
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: tfgrid/info_tfgrid#50
No description provided.
Delete Branch "main"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?