Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Revert "Encrypt attachments in encrypted rooms," #546

Merged
merged 1 commit into from
Nov 11, 2016
Merged

Revert "Encrypt attachments in encrypted rooms," #546

merged 1 commit into from
Nov 11, 2016

Conversation

dbkr
Copy link
Member

@dbkr dbkr commented Nov 11, 2016

Reverts #533

Incorrectly went to master

@NegativeMjark NegativeMjark merged commit f6b3248 into master Nov 11, 2016
@NegativeMjark NegativeMjark mentioned this pull request Nov 11, 2016
Merged
richvdh added a commit that referenced this pull request Nov 12, 2016
@richvdh
Complete attachment-encryption patch
34df6ea 
#533 originally landed in
the wrong branch, and was reverted by
#546.
#548 attempted to land it on
the develop branch, but omitted a small amount of the patch.

This lands the final part, which got missed out.
@dbkr dbkr deleted the revert-533-markjh/encrypted-attachments branch December 14, 2016 18:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dbkr @NegativeMjark