DocSpace-client/public/locales/de
Elyor Djalilov 3ab64b3347 Merge branch 'develop' into feature/security-active-sessions
# Conflicts:
#	packages/client/public/locales/en/Profile.json
#	packages/client/public/locales/lo-LA/PeopleTranslations.json
#	packages/client/public/locales/ru/Profile.json
#	packages/client/src/Shell.jsx
#	packages/client/src/components/dialogs/LogoutSessionDialog/LogoutSessionDialog.tsx
#	packages/client/src/components/dialogs/index.js
#	packages/shared/themes/base.ts
#	packages/shared/themes/dark.ts
#	public/locales/ru/Common.json
#	yarn.lock
2024-08-23 10:34:49 +05:00
..
Common.json Merge branch 'develop' into feature/security-active-sessions 2024-08-23 10:34:49 +05:00