Hinton 04c8b119e3 Merge branch 'master' of https://github.com/bitwarden/desktop into feature/browser-communication ... # Conflicts: # src/locales/en/messages.json		2020-11-13 15:34:57 +01:00
..
accounts	Merge branch 'master' of https://github.com/bitwarden/desktop into feature/browser-communication	2020-11-13 15:34:57 +01:00
vault	onDestroy needed for broadcast subscriptions	2020-11-04 14:00:44 -05:00
app-routing.module.ts	merge sso feature branch (#523)	2020-08-21 09:50:36 -04:00
app.component.ts	Split native messaging into renderer and background service. Encrypt messages and verify timestamp	2020-10-12 21:18:28 +02:00
app.module.ts	language updates	2020-09-15 13:38:36 -04:00
dummy.module.ts	dummy module update	2018-07-07 23:57:14 -04:00
main.ts	preserveWhitespaces	2018-09-13 12:04:04 -04:00
services.module.ts	Add connected/disconnected calls in proxy application	2020-10-21 15:56:27 +02:00