Tatiana Lopaeva 8ba2f0c694 Merge branch 'develop' into feature/backup ... # Conflicts: # packages/asc-web-common/api/settings/index.js # web/ASC.Web.Api/Models/SettingsWrapper.cs		2021-10-25 11:02:42 +03:00
..
AuthStore.js	Web: Desktop: Changed provider to "onlyoffice" and renamed guid to cryptoEngineId	2021-10-06 11:26:06 +03:00
index.js	Web: Common: chsnged component hierarchy	2021-02-25 11:04:22 +03:00
ModuleStore.js	Web: Proxy fixes	2021-03-22 17:35:33 +03:00
SettingsStore.js	Merge branch 'develop' into feature/backup	2021-10-25 11:02:42 +03:00
TfaStore.js	Web: Common: added backupCodes in tfa store	2021-06-08 14:19:36 +03:00
UserStore.js	Web: Common: fixed warning	2021-09-06 12:30:58 +03:00