Hinton db59f2791a Merge branch 'master' of github.com:bitwarden/browser into feature/safari-webext ... # Conflicts: # src/browser/safariApp.ts # src/safari/safari/SafariExtensionViewController.swift # src/services/browserPlatformUtils.service.ts		2021-01-13 14:21:45 +01:00
..
_locales	[Policy] Personal Ownership banner (#1523)	2021-01-05 17:34:00 -06:00
background	Merge branch 'master' of github.com:bitwarden/browser into feature/safari-webext	2021-01-13 14:21:45 +01:00
browser	Fix safari sso (#1508)	2020-12-29 09:18:14 -06:00
content	Fix safari sso (#1508)	2020-12-29 09:18:14 -06:00
images	update icons to new branding (#1245)	2020-05-22 23:14:29 -04:00
models	check maxLength	2019-01-14 22:45:12 -05:00
notification	Remove more old safari app ext code	2020-12-11 15:25:35 +01:00
popup	Merge branch 'master' of github.com:bitwarden/browser into feature/safari-webext	2021-01-13 14:21:45 +01:00
safari	Fix safari sso (#1508)	2020-12-29 09:18:14 -06:00
scripts	formatting js files. remove old u2f	2018-04-13 22:54:28 -04:00
services	Merge branch 'master' of github.com:bitwarden/browser into feature/safari-webext	2021-01-13 14:21:45 +01:00
background.html	revert ts webpack since it breaks watching	2018-04-06 23:20:53 -04:00
background.ts	Initial work of biometric unlock for browser	2020-10-09 17:16:15 +02:00
globals.d.ts	Initial work of biometric unlock for browser	2020-10-09 17:16:15 +02:00
manifest.json	Merge pull request #1426 from Hinton/feature/desktop-bridge	2020-12-04 12:21:23 -05:00