Merge branch 'master' into add-crowdin-sync-workflow

This commit is contained in:
Joseph Flinn 2021-08-13 13:27:32 -07:00 committed by GitHub
commit c2af9c2df3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

2
jslib

@ -1 +1 @@
Subproject commit c70c8ecc247cb92e1f867630031fd5cdf124bcd3
Subproject commit 1f0127966e85aa29f9e50144de9b2a03b00de5d4

View File

@ -60,7 +60,7 @@
</div>
</ng-container>
<ng-container *ngIf="selectedProviderType === providerType.WebAuthn && !webAuthnNewTab">
<div id="web-authn-frame"><iframe id="webauthn_iframe"></iframe></div>
<div id="web-authn-frame"><iframe id="webauthn_iframe" [allow]="webAuthnAllow"></iframe></div>
<div class="box">
<div class="box-content">
<div class="box-content-row box-content-row-checkbox" appBoxRow>