imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering

Browse source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner 2021-07-08 17:17:34 +02:00
commit b7af39ffff
No known key found for this signature in database
GPG key ID: 9760693FDD98A790
131 changed files with 882 additions and 875 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/customisations/Security.ts
View file

@ -16,7 +16,7 @@ limitations under the License.
import { IMatrixClientCreds } from "../MatrixClientPeg";
import { Kind as SetupEncryptionKind } from "../toasts/SetupEncryptionToast";
import { ISecretStorageKeyInfo } from 'matrix-js-sdk/src/matrix';
import { ISecretStorageKeyInfo } from 'matrix-js-sdk/src/crypto/api';
/* eslint-disable-next-line @typescript-eslint/no-unused-vars */
function examineLoginResponse(