IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
03b03ed910
DocSpace-client/packages/client/public/locales
History
Alexey Safronov 03b03ed910 Merge branch 'develop' into feature/sso 
# Conflicts:
#	packages/client/public/images/actions.upload.react.svg
#	packages/client/public/images/empty_screen_privacy.png
#	packages/client/public/locales/en/SingleSignOn.json
#	packages/client/public/locales/ru/SingleSignOn.json
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/PortalSettings/categories/integration/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerItem.js
#	packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerModalDialog.js
#	packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerToggle.js
#	packages/client/src/pages/PortalSettings/categories/integration/sub-components/modalDialogContainer.js
#	packages/client/src/pages/PortalSettings/categories/integration/sub-components/ssoLoader.js
#	packages/client/src/pages/PortalSettings/categories/integration/thirdPartyServicesSettings.js
#	packages/client/src/store/SsoFormStore.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerItem.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerModalDialog.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerToggle.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/modalDialogContainer.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerItem.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerToggle.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/modalDialogContainer.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
2022-08-02 12:05:15 +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' into feature/sso 2022-08-02 12:05:15 +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 Merge branch 'develop' into feature/sso 2022-08-02 12:05:15 +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