Shane Melton 389ac2819c Merge branch 'master' into feature/i18n-component-template

2023-10-04 15:22:10 -07:00

..

browser

[PM-2044] Fix hotkeys and context menu not resetting the vault timeout timer (#5313)

2023-10-04 16:31:50 -04:00

cli

Bumped cli version to 2023.9.2 (#6492)

2023-10-03 11:01:11 -07:00

desktop

[AC-1347] Allow editing of collections in individual vault (#6081)

2023-10-04 14:15:20 -07:00

web

Merge branch 'master' into feature/i18n-component-template

2023-10-04 15:22:10 -07:00