Resolve conflicts main<--develop #121
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Includes the following work: - #81 - #77 - #71 - #70 - #69 - #67 - #66 - #63 (note this update requires a core-eval proposal to take effect) QA is tracked [here](https://docs.google.com/spreadsheets/d/1bBJhr73o4W2rd3oYNpK_xET_3m6kNYYbeaDvMKIRQRM/edit?usp=sharing) --------- Co-authored-by: Privilege Mendes <20317699+privilegemendes@users.noreply.github.com> Co-authored-by: Axel Verheul <axel@kryha.io> Co-authored-by: Xabier <146219902+snthtcs@users.noreply.github.com> Co-authored-by: Xabier Almazor <xabier@Xabiers-MBP.home> Co-authored-by: Xabier Almazor <xabier@Xabiers-MBP.localdomain> Co-authored-by: Wietze <wietze@kryha.io> Co-authored-by: Xabier Almazor Telek <xabier@kryha.io> Co-authored-by: Nick K <nick.koster@gmail.com> Co-authored-by: Nick Koster <nick@kryha.io> Co-authored-by: Pandelis Symeonidis <pandelis@kryha.io> Co-authored-by: Pandelis Symeonidis <54764628+Pandelissym@users.noreply.github.com> Co-authored-by: MangoDream1 <MangoDream1@users.noreply.github.com> Co-authored-by: Synthetics <snthtcs@Syntheticss-MBP.localdomain>
Includes the following work: - #81 - #77 - #71 - #70 - #69 - #67 - #66 - #63 (note this update requires a core-eval proposal to take effect) QA is tracked [here](https://docs.google.com/spreadsheets/d/1bBJhr73o4W2rd3oYNpK_xET_3m6kNYYbeaDvMKIRQRM/edit?usp=sharing) --------- Co-authored-by: Privilege Mendes <20317699+privilegemendes@users.noreply.github.com> Co-authored-by: Axel Verheul <axel@kryha.io> Co-authored-by: Xabier Almazor <xabier@Xabiers-MBP.home> Co-authored-by: Xabier Almazor <xabier@Xabiers-MBP.localdomain> Co-authored-by: Wietze <wietze@kryha.io> Co-authored-by: CARLOS TRIGO <carlos@kryha.io> Co-authored-by: Xabier Almazor Telek <xabier@kryha.io> Co-authored-by: Nick K <nick.koster@gmail.com> Co-authored-by: Nick Koster <nick@kryha.io> Co-authored-by: carlos-kryha <97608823+carlos-kryha@users.noreply.github.com> Co-authored-by: Pandelis Symeonidis <pandelis@kryha.io> Co-authored-by: Pandelis Symeonidis <54764628+Pandelissym@users.noreply.github.com> Co-authored-by: MangoDream1 <MangoDream1@users.noreply.github.com> Co-authored-by: Synthetics <snthtcs@Syntheticss-MBP.localdomain> Co-authored-by: Synthetics <snthtcs@Syntheticss-MBP.home>
WietzeSlagman
approved these changes
Mar 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Merging main onto develop as a pre-req for #120