Skip to content

Merge release 2.1.0 into develop branch#1607

Merged
0xnm merged 3 commits into
developfrom
nogorodnikov/merge-2.1.0-into-develop
Sep 7, 2023
Merged

Merge release 2.1.0 into develop branch#1607
0xnm merged 3 commits into
developfrom
nogorodnikov/merge-2.1.0-into-develop

Conversation

@0xnm

@0xnm 0xnm commented Sep 7, 2023

Copy link
Copy Markdown
Member

What does this PR do?

This PR does the merge of release 2.1.0 into develop branch with all the conflicts resolved (there was one conflict in AndroidConfig.kt).

Review checklist (to be filled by reviewers)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • Make sure you discussed the feature or bugfix with the maintaining team in an Issue
  • Make sure each commit and the PR mention the Issue number (cf the CONTRIBUTING doc)

@0xnm
0xnm requested a review from a team as a code owner September 7, 2023 08:17
@0xnm
0xnm merged commit b8c9f06 into develop Sep 7, 2023
@0xnm
0xnm deleted the nogorodnikov/merge-2.1.0-into-develop branch September 7, 2023 09:41
@xgouchet xgouchet added this to the 2.2.0 milestone Dec 13, 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.

2 participants