abb8ee3464
Conflicts: packages/client/public/locales/en/People.json packages/client/public/locales/en/Settings.json packages/client/public/locales/ru/People.json packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js packages/client/src/pages/PortalSettings/utils/settingsTree.js packages/client/src/store/index.js packages/shared/enums/index.ts packages/shared/themes/base.ts packages/shared/themes/dark.ts |
||
---|---|---|
.. | ||
css | ||
fonts/v35 | ||
images | ||
locales | ||
offline | ||
scripts | ||
thirdparty | ||
appIcon-180.png | ||
appIcon-192.png | ||
appIcon-512.png | ||
favicon.ico | ||
icon.svg | ||
index.ts | ||
manifest.json |