TatianaLopaeva 0f3eb1350b Merge branch 'develop' into feature/team-template ... # Conflicts: # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json		2021-04-20 12:05:19 +03:00
..
AuthStore.js	Big Fix commit:	2021-03-22 00:34:21 +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/team-template	2021-04-20 12:05:19 +03:00
UserStore.js	Web: Common: Fixed setting user culture	2021-04-07 12:19:12 +03:00