caa7c632c4
Conflicts: packages/client/public/locales/en/Settings.json packages/client/public/locales/ru/Settings.json packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js packages/client/src/pages/PortalSettings/utils/settingsTree.js packages/client/src/routes/portalSettings.js packages/client/src/store/DialogsStore.js packages/client/src/store/index.js packages/components/table-container/TableHeaderCell.js public/locales/en/Common.json |
||
---|---|---|
.. | ||
actions | ||
i18next-http-backend | ||
axiosClient.js | ||
beforeBuild.js | ||
catalogIcon.helper.ts | ||
checkDialogsOpen.js | ||
combineUrl.js | ||
convertTime.js | ||
dataUrlToFile.js | ||
encoder.js | ||
firebase.js | ||
image-flags.js | ||
image-helpers.js | ||
image-thirdparties.js | ||
index.ts | ||
indexedDBHelper.js | ||
loginUtils.ts | ||
minifyJson.js | ||
socket.js | ||
tryRedirectTo.js | ||
useThemeDetector.js | ||
wdyr.js | ||
withLayoutSize.js |