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

Remove new device support #421

Merged
merged 3 commits into from
Nov 21, 2017
Merged

Remove new device support #421

merged 3 commits into from
Nov 21, 2017

Conversation

manuroe
Copy link
Contributor

@manuroe manuroe commented Nov 21, 2017

matrix-org/matrix-js-sdk#483

I still need to upload one-time keys on [MXCrypto start] to make test happy. I will fix it in a coming PR.

 We still need to call maybeUploadOneTimeKeys on [MXCrypto start] to make tests pass.
…support

# Conflicts:
#	MatrixSDK/Crypto/MXCrypto.m
@manuroe manuroe requested a review from giomfo November 21, 2017 10:54
Copy link
Member

@giomfo giomfo left a comment

Choose a reason for hiding this comment

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

SGTM

@manuroe manuroe merged commit a91128d into develop Nov 21, 2017
@manuroe manuroe deleted the remove_new_device_support branch November 21, 2017 12:55
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.

None yet

2 participants