Viktor Fomin 048237dffc Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation ... # Conflicts: # packages/client/src/pages/Confirm/sub-components/deactivatePortal.js # packages/client/src/pages/Confirm/sub-components/removePortal.js # packages/client/src/pages/PortalSettings/categories/data-management/index.js # packages/client/src/pages/PortalSettings/categories/delete-data/DeleteDataLoader.js # packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js # packages/client/src/pages/PortalSettings/categories/delete-data/index.js # packages/client/src/pages/PortalSettings/categories/delete-data/portalDeactivation.js # packages/client/src/pages/PortalSettings/categories/delete-data/portalDeletion.js # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/src/components/pages/Confirm/index.js # web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js # web/ASC.Web.Client/src/components/pages/Settings/index.js # web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js		2022-08-11 21:47:39 +03:00
..
az	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
bg	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
cs	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
de	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
el	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
en	Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation	2022-08-11 21:47:39 +03:00
es	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
fi	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
fr	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
hy-AM	Merge branch 'develop' into refactoring/client	2022-07-28 10:38:29 +03:00
it	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
ja	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
ko	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
lo	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
lv	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
nl	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
pl	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
pt	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
pt-BR	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
ro	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
ru	SSO: fix translate	2022-08-04 14:42:59 +03:00
sk	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
sl	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
tr	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
uk	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
vi	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
zh-CN	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00