Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-06 09:20:43 +01:00
Code Issues Projects Releases Wiki Activity

bitwarden json importer

Browse Source
This commit is contained in:
Kyle Spearrin 2018-12-17 13:21:16 -05:00
parent 951a22b90e
commit 0e1f2e721f
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 3b22df15e8cb2f14c2b4dfe996af9bbb721902d0 Subproject commit 4d57f44a6944cf4037802388dfdab02dc75b7c37

2
src/app/tools/import.component.html
View File

@ -17,7 +17,7 @@
</div> </div>
</div> </div>
<app-callout type="info" title="{{getFormatInstructionTitle()}}" *ngIf="format"> <app-callout type="info" title="{{getFormatInstructionTitle()}}" *ngIf="format">
<ng-container *ngIf="format === 'bitwardencsv'"> <ng-container *ngIf="format === 'bitwardencsv' || format === 'bitwardenjson'">
See detailed instructions on our help site at See detailed instructions on our help site at
<a target="_blank" rel="noopener" href="https://help.bitwarden.com/article/export-your-data/">https://help.bitwarden.com/article/export-your-data/</a> <a target="_blank" rel="noopener" href="https://help.bitwarden.com/article/export-your-data/">https://help.bitwarden.com/article/export-your-data/</a>
</ng-container> </ng-container>