gopienkonikita 7d727e0842 Merge branch 'develop' into feature/public-room ... # Conflicts: # packages/client/src/components/dialogs/index.js # packages/client/src/components/panels/UploadPanel/index.js # packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js # packages/client/src/pages/Home/Section/Header/index.js # packages/client/src/store/FilesActionsStore.js # packages/client/src/store/FilesStore.js		2023-07-25 13:01:21 +03:00
..
api	Merge branch 'develop' into feature/public-room	2023-07-25 13:01:21 +03:00
components	Merge branch 'develop' into feature/public-room	2023-07-25 13:01:21 +03:00
constants	Merge branch 'develop' into feature/public-room	2023-07-07 10:35:33 +03:00
desktop
hoc	Web: Fix crash of /wizard on static version	2023-04-25 19:46:51 +04:00
store	Merge branch 'develop' into feature/public-room	2023-07-25 13:01:21 +03:00
sw	Web:Editor: disable sw and fix tranlsation hash	2023-01-31 17:10:19 +03:00
utils	Merge branch 'develop' into feature/public-room	2023-07-25 13:01:21 +03:00
browserslist-config-asc.js
custom.scss	Revert "Merge branch 'release/1.0.0' into branch feature/image-thumbnail"	2023-03-22 15:37:41 +03:00
fonts.js
index.d.ts	Web: Added Zendesk live chat + refactoring	2023-04-04 00:46:59 +04:00
index.js
opensansoffline.scss	Web:Common: update import for fonts	2023-02-02 15:10:54 +03:00
package.json	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00