Merge master #2183
Merged
Merge master #2183
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
This reverts commit ae730d2.
Release 2022-03-07
* use assetkey type in imageasset * fix build integration tests * moved cql instance for assetkey * changelog * tweak changelog. * asset key cql instance handle invalid keys in db * comment * use Icon/AssetKey in team and user profile (wire-api changes only) * Cassandra Icon instance * fix integration test * fix galley integration tests * fix spar integration tests * format Co-authored-by: Matthias Fischmann <mf@zerobuzz.net>
akshaymankar
reviewed
Mar 7, 2022
There was a problem hiding this comment.
Looks like we lost the changelog for #2162, please add that back.
Can you please look again? It doesn't show in the diff because it hasn't been removed, so it's still there! |
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.
This also recovers #2162, which has been omitted in the last release.