From 867115659f9a5837344bd30e8ece5a5e95d88dce Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 26 Nov 2018 15:36:09 -0500
Subject: [PATCH] re-enable key rotation on master password change

---
 jslib                                           | 2 +-
 src/app/settings/change-password.component.html | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/jslib b/jslib
index 0ae636aa53d..64a6015a67a 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 0ae636aa53dc7e2f39a21e60612f6bd7771a34a0
+Subproject commit 64a6015a67a8110cd8a4ef897e1338c71c4b6b49
diff --git a/src/app/settings/change-password.component.html b/src/app/settings/change-password.component.html
index d7b329b5e11..230ec97b234 100644
--- a/src/app/settings/change-password.component.html
+++ b/src/app/settings/change-password.component.html
@@ -27,7 +27,6 @@
             </div>
         </div>
     </div>
-    <!--
     <div class="form-group">
         <div class="form-check">
             <input class="form-check-input" type="checkbox" id="rotateEncKey" name="RotateEncKey" [(ngModel)]="rotateEncKey"
@@ -41,7 +40,6 @@
             </a>
         </div>
     </div>
-    -->
     <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
         <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
         <span>{{'changeMasterPassword' | i18n}}</span>