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

Merge changes from develop again #2807

Merged
merged 13 commits into from
Oct 26, 2022
Merged

Merge changes from develop again #2807

merged 13 commits into from
Oct 26, 2022

Conversation

dbkr
Copy link
Member

@dbkr dbkr commented Oct 26, 2022 •
edited by github-actions bot
Loading

Checklist

  • Tests written for new code (and old code if feasible)
  • Linter and other CI checks pass
  • Sign-off given on the changes (see CONTRIBUTING.md)

This change is marked as an internal change (Task), so will not be included in the changelog.

RiotRobot and others added 12 commits October 18, 2022 12:49
@RiotRobot
Prepare changelog for v21.0.0-rc.1
e592f60
@RiotRobot
v21.0.0-rc.1
fc1b03c
@RiotRobot @t3chguy
[Backport staging] Fix POST data not being passed for registerWithIde…
63f4bf5 
…ntityServer (#2770)

Co-authored-by: Michael Telatynski <[email protected]>
@RiotRobot @t3chguy
[Backport staging] Improve crypto init code and allow easier shimming (…
4ccc52d 
…#2792)

Co-authored-by: Michael Telatynski <[email protected]>
@RiotRobot
Prepare changelog for v21.0.0-rc.2
7772f85
@RiotRobot
v21.0.0-rc.2
e7ce1fb
@RiotRobot
Prepare changelog for v21.0.0
c8c7af0
@RiotRobot
v21.0.0
1842004
@RiotRobot
Merge branch 'master' into develop
f2ae3bc
@RiotRobot
Resetting package fields for development
4b3e693
@t3chguy
Fix more typescript --strict violations (#2795)
9f2f08d 
* Stash tsc fixes

* Iterate

* Iterate

* Iterate

* Fix tests

* Iterate

* Iterate

* Iterate

* Iterate

* Add tests
@dbkr
Merge remote-tracking branch 'origin/develop' into dbkr/gcmerge_26oct22
384116c
@dbkr dbkr added the T-Task Tasks for the team like planning label Oct 26, 2022
@dbkr dbkr requested a review from a team as a code owner October 26, 2022 10:57
SimonBrandner
SimonBrandner approved these changes Oct 26, 2022
View reviewed changes
Copy link
Contributor

@SimonBrandner SimonBrandner left a comment

Choose a reason for hiding this comment

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

Looks like a merge

@dbkr dbkr merged commit 4cd50e4 into robertlong/group-call Oct 26, 2022
@dbkr dbkr deleted the dbkr/gcmerge_26oct22 branch October 26, 2022 11:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SimonBrandner SimonBrandner SimonBrandner approved these changes

Assignees
No one assigned
Labels
T-Task Tasks for the team like planning
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@dbkr @SimonBrandner @RiotRobot @t3chguy