Tatiana Lopaeva 7b623c4e30 Merge branch 'develop' into feature/stripe ... # Conflicts: # packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js # packages/client/src/pages/PortalSettings/utils/settingsTree.js # packages/common/store/AuthStore.js # packages/components/slider/index.js # web/ASC.Web.Api/Api/Settings/SettingsController.cs		2022-09-05 10:19:52 +03:00
..
Client/src	Web: Added prop type.	2022-08-11 15:55:46 +03:00
Core	Merge branch 'develop' into feature/stripe	2022-09-05 10:19:52 +03:00
Server	Merge pull request #780 from ONLYOFFICE/feature/private-virtual-rooms	2022-09-01 19:34:12 +04:00
Service	Api: removed unused columns	2022-08-30 19:01:12 +03:00
Tests	packages updated	2022-08-01 13:58:12 +03:00