From 0e1f2e721fc5a3f24b4609ab8ef7b5d36e8de8d3 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 17 Dec 2018 13:21:16 -0500
Subject: [PATCH] bitwarden json importer

---
 jslib                               | 2 +-
 src/app/tools/import.component.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jslib b/jslib
index 3b22df15e8..4d57f44a69 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 3b22df15e8cb2f14c2b4dfe996af9bbb721902d0
+Subproject commit 4d57f44a6944cf4037802388dfdab02dc75b7c37
diff --git a/src/app/tools/import.component.html b/src/app/tools/import.component.html
index 677b7af1d6..abf052c664 100644
--- a/src/app/tools/import.component.html
+++ b/src/app/tools/import.component.html
@@ -17,7 +17,7 @@
         </div>
     </div>
     <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
             <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>