Elyor Djalilov 82f32d8b0b Merge branch 'develop' into feature/data-migration ... # Conflicts: # packages/client/src/pages/PortalSettings/utils/settingsTree.js # packages/client/src/routes/portalSettings.js # packages/client/src/store/DialogsStore.js		2024-03-05 20:12:08 +05:00
..
base.ts	Merge branch 'develop' into feature/data-migration	2024-03-05 20:12:08 +05:00
commonTheme.ts	Web: Shared: Set type for theme interfaceDirection. Move TInterfaceDirection to avoid cycle import.	2024-02-22 15:34:42 +01:00
dark.ts	Merge branch 'develop' into feature/data-migration	2024-03-05 20:12:08 +05:00
globalColors.ts	Merge branch 'develop' into feature/groups	2024-02-27 16:32:55 +01:00
index.ts	Web: Shared: Set type for theme interfaceDirection. Move TInterfaceDirection to avoid cycle import.	2024-02-22 15:34:42 +01:00