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.

Sign up for GitHub

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

Jump to bottom

chore: merge develop into main #7496

Merged
merged 2 commits into from
Sep 29, 2023
Merged

chore: merge develop into main #7496

merged 2 commits into from
Sep 29, 2023

Conversation

begonaalvarezd
Copy link
Member

Summary

Please summarize your changes, describing what they are and why they were made.

...

Changelog

- Please write a list of changes

Testing

Platforms

Please select any platforms where your changes have been tested.

  • Desktop
    • MacOS
    • Linux
    • Windows

Instructions

Please describe the specific instructions, configurations, and/or test cases necessary to test and verify that your changes work as intended.

...

Checklist

Please tick the following boxes that are relevant to your changes.

  • I have followed the contribution guidelines for this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or modified tests that prove my changes work as intended
  • I have verified that new and existing unit tests pass locally with my changes
  • I have verified that my latest changes pass CI workflows for testing and linting
  • I have made corresponding changes to the documentation

begonaalvarezd and others added 2 commits September 29, 2023 12:44
@begonaalvarezd
Merge pull request #7471 from iotaledger/main
c05d3f9 
chore: merge `main` into `develop`
@begonaalvarezd @cpl121 @marc2332
chore & fix: update code for shimmer app (#7495)
96dffdf 
* chore & fix: update code for shimmer app

Co-authored-by: cpl121 <[email protected]>
Co-authored-by: Marc Espín <[email protected]>

* fix: cache invalidation mask

---------

Co-authored-by: cpl121 <[email protected]>
Co-authored-by: Marc Espín <[email protected]>
@begonaalvarezd begonaalvarezd merged commit 47dba62 into main Sep 29, 2023
9 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cpl121 cpl121 cpl121 approved these changes

@marc2332 marc2332 marc2332 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@begonaalvarezd @marc2332 @cpl121