Merge commit '02fe7159034b04d763a61fcf0200869e3209fa33' into PS-589-add-2fa-new-device-login-settings-flag
# Conflicts: # apps/web/src/app/modules/vault-filter/organization-vault-filter.component.ts # jslib
This commit is contained in:
commit
65cef08f7b
|
@ -1,4 +0,0 @@
|
||||||
[submodule "jslib"]
|
|
||||||
path = jslib
|
|
||||||
url = https://github.com/bitwarden/jslib.git
|
|
||||||
branch = master
|
|
|
@ -2,7 +2,7 @@
|
||||||
build
|
build
|
||||||
dist
|
dist
|
||||||
|
|
||||||
jslib
|
#jslib
|
||||||
|
|
||||||
# External libraries / auto synced locales
|
# External libraries / auto synced locales
|
||||||
src/locales
|
src/locales
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue