Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release/5.2.0 into main #3099

Merged
merged 40 commits into from
Jan 17, 2023
Merged

Merge release/5.2.0 into main #3099

merged 40 commits into from
Jan 17, 2023

Conversation

danielmain
Copy link
Contributor

This PR merges the release 5.2.0 branch into main branch

VanessaPC and others added 30 commits October 26, 2022 14:36
* [DDW-1152] Fix General > General story to have it's own storybook state.

* [DDW-1152] Fixes the toggle status and story status update on General > Wallets.

* [DDW-1152] Fixes the toggle statuses in General - Security

* [DDW-1152] Code cleanup after all the solutions are added.

* [DDW-1152] Updates Changelog entry.

* [DDW-1152] Code cleanup to the final solution of  general stories.

* [DDW-1152] Cleaning up both Languages and General stories.

* [DDW-1152] Small adjustment on Changelog input.
modernize tullia CI

Co-authored-by: Michal Rus <michal.rus@iohk.io>
…atalyst-api

[DDW-1175] Catalyst API URL updated
…-size-in-analytics

[DDW-1161] Round RAM size in analytics
…u-formatting-in-analytics

[DDW-1163] CPU name grouping mechanism for analytics
Copy link
Member

@michalrus michalrus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@michalrus
Copy link
Member

michalrus commented Jan 17, 2023

Buildkite for Linux fails, but it was killed. I hit "restart" just now. The commit tree is correct, though, so we can merge =)

@danielmain danielmain closed this Jan 17, 2023
@danielmain danielmain reopened this Jan 17, 2023
@danielmain danielmain merged commit e0e942d into main Jan 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants