devol
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

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
parent 617074eb09 1c9d261f0c
commit c2af9c2df3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

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

2
src/popup/accounts/two-factor.component.html
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>