David Baker
|
f928be6f59
|
Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental"
This reverts commit ad47144355 .
|
2019-01-03 15:37:03 -07:00 |
|
David Baker
|
7d161de35b
|
Partial merge of develop to experimental
Does not include #2336 as the file has been moved out from underneath it:
will do this separately
|
2019-01-03 15:02:58 +00:00 |
|
David Baker
|
132408cf02
|
Add e2e backup recovery with passphrase
|
2018-11-20 16:16:24 +00:00 |
|
David Baker
|
fbab8ceeef
|
Passphrase based key backups
Add passphrase support to backup creation stage
|
2018-11-20 13:11:58 +00:00 |
|