Viktor Fomin b7ce4a35e7 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins ... # Conflicts: # products/ASC.Files/Server/DocStore # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json # web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js # web/ASC.Web.Client/src/components/pages/Settings/index.js		2021-06-09 00:23:12 +03:00
..
ASC.Web.Api	Tfa: fix	2021-06-08 11:34:14 +03:00
ASC.Web.Client	Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins	2021-06-09 00:23:12 +03:00
ASC.Web.Core	Merge branch 'develop' into feature/two-factor-auth	2021-06-07 11:54:06 +03:00
ASC.Web.Editor	Web: i18n: Replaced i18т config load: from "languageOnly" to "all" and added new utils function loadLanguagePath() + Refactoring	2021-06-02 13:55:11 +03:00
ASC.Web.Login	Merge branch 'develop' into feature/two-factor-auth	2021-06-02 23:57:00 +03:00
ASC.Web.Studio	Tests moved to separate projects.	2021-06-01 12:21:51 +03:00