DocSpace-client/web/ASC.Web.Client/public/locales
Viktor Fomin e879d94bff Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
#	packages/asc-web-common/api/settings/index.js
#	packages/asc-web-components/checkbox/index.js
#	packages/asc-web-components/file-input/index.js
#	packages/asc-web-components/index.js
#	packages/asc-web-components/label/index.js
#	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/Layout/Article/Body/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/index.js
2022-06-15 13:52:00 +03:00
..
az Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS 2022-01-21 12:53:29 +03:00
bg merge 2022-03-24 20:56:51 +03:00
cs Merge branch 'feature/virtual-rooms-1.2' into feature/add-units 2022-04-04 19:34:51 +03:00
de merge 2022-03-24 20:56:51 +03:00
el Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS 2022-01-21 12:53:29 +03:00
en Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso 2022-06-15 13:52:00 +03:00
es merge 2022-03-24 20:56:51 +03:00
fi merge 2022-03-24 20:56:51 +03:00
fr merge 2022-03-24 20:56:51 +03:00
it merge 2022-03-24 20:56:51 +03:00
ja merge 2022-03-24 20:56:51 +03:00
ko Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS 2022-01-21 12:53:29 +03:00
lo Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS 2022-01-21 12:53:29 +03:00
lv merge 2022-03-24 20:56:51 +03:00
nl Merge branch 'feature/virtual-rooms-1.2' into feature/add-units 2022-04-04 19:34:51 +03:00
pl merge 2022-03-24 20:56:51 +03:00
pt Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS 2022-01-21 12:53:29 +03:00
pt-BR Merge branch 'feature/virtual-rooms-1.2' into feature/add-units 2022-04-04 19:34:51 +03:00
ro Merge branch 'master' into develop 2022-02-21 22:22:38 +03:00
ru Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso 2022-06-15 13:52:00 +03:00
sk merge 2022-03-24 20:56:51 +03:00
sl merge 2022-03-24 20:56:51 +03:00
tr merge 2022-03-24 20:56:51 +03:00
uk merge 2022-03-24 20:56:51 +03:00
vi merge 2022-03-24 20:56:51 +03:00
zh-CN merge 2022-03-24 20:56:51 +03:00