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

Conversation

Projects
None yet
2 participants
@turt2live
Copy link
Member

commented May 30, 2019

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

Add Olm unwedging
As per [MSC1719](#1719)

No known alterations have been made to the proposal.

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

@turt2live turt2live requested a review from matrix-org/spec-core-team May 30, 2019

@uhoreg

uhoreg approved these changes May 31, 2019

Copy link
Member

left a comment

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

Show resolved Hide resolved specification/modules/end_to_end_encryption.rst Outdated
Show resolved Hide resolved specification/modules/end_to_end_encryption.rst Outdated
typo
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 label May 31, 2019

@turt2live turt2live removed the blocked label Jun 4, 2019

@turt2live turt2live merged commit 9cb60fa into master Jun 4, 2019

8 checks passed

buildkite/matrix-doc Build #187 passed (59 seconds)
Details
ci/circleci: build-dev-scripts Your tests passed on CircleCI!
Details
ci/circleci: build-docs Your tests passed on CircleCI!
Details
ci/circleci: build-swagger Your tests passed on CircleCI!
Details
ci/circleci: check-docs Your tests passed on CircleCI!
Details
ci/circleci: validate-docs Your tests passed on CircleCI!
Details
docs Click details to preview the HTML documentation.
Details
swagger Click to preview the swagger build.
Details

@turt2live turt2live deleted the travis/1.0/msc1719-olm-unwedge branch Jun 4, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.