Merge branch 'master' of github.com:bitwarden/desktop into feature/eslint

jslib

@@ -1 +1 @@
-Subproject commit 60878cd4ed9b1989860a918b62ce72529232560f
+Subproject commit 1cbc119ad8c0447046624634dcd09262bb3f9b46

src/app/vault/add-edit-custom-fields.component.html

@@ -95,7 +95,7 @@
           </a>
         </div>
         <div class="drag-handle" appA11yTitle="{{ 'dragToSort' | i18n }}" cdkDragHandle>
-          <i class="bwi bwi-bars" aria-hidden="true"></i>
+          <i class="bwi bwi-hamburger" aria-hidden="true"></i>
         </div>
       </div>
     </div>

src/locales/en/messages.json

@@ -1813,5 +1813,8 @@
   },
   "options": {
     "message": "Options"
+  },
+  "sessionTimeout": {
+    "message": "Your session has timed out. Please go back and try logging in again."
   }
 }

src/main/menu.window.ts

@@ -18,10 +18,10 @@ export class WindowMenu implements IMenubarMenu {
     const items = [this.minimize, this.hideToMenu, this.alwaysOnTop];
 
     if (isMac()) {
-      items.concat([this.zoom, this.separator, this.bringAllToFront]);
+      items.push(this.zoom, this.separator, this.bringAllToFront);
     }
 
-    items.concat([this.separator, this.close]);
+    items.push(this.separator, this.close);
     return items;
   }