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

Add Olm unwedging #2059

Merged
merged 5 commits into from
Jun 4, 2019
Merged

Add Olm unwedging #2059

merged 5 commits into from
Jun 4, 2019

Conversation

turt2live
Copy link
Member

This PR cannot be merged until the FCP on MSC1719 is over.

As per MSC1719

No known alterations have been made to the proposal.

Implementation proof: matrix-org/matrix-js-sdk#780

As per [MSC1719](#1719)

No known alterations have been made to the proposal.

Implementation proof: matrix-org/matrix-js-sdk#780
@turt2live turt2live added the Matrix 1.0 Spec PRs that need review for 1.0 label May 30, 2019
@turt2live turt2live requested a review from a team May 30, 2019 22:48
Copy link
Member

@uhoreg uhoreg left a comment

Choose a reason for hiding this comment

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

Couple of minor things, but otherwise lgtm (pending completion of FCP)

specification/modules/end_to_end_encryption.rst Outdated Show resolved Hide resolved
specification/modules/end_to_end_encryption.rst Outdated Show resolved Hide resolved
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
@turt2live turt2live self-assigned this May 31, 2019
@turt2live turt2live removed their assignment May 31, 2019
@turt2live turt2live added the blocked Something needs to be done before action can be taken on this PR/issue. label May 31, 2019
@turt2live turt2live removed the blocked Something needs to be done before action can be taken on this PR/issue. label Jun 4, 2019
@turt2live turt2live merged commit 9cb60fa into master Jun 4, 2019
@turt2live turt2live deleted the travis/1.0/msc1719-olm-unwedge branch June 4, 2019 17:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Matrix 1.0 Spec PRs that need review for 1.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants