pavelbannov df62b3862f Merge branch 'release/v1.0.0' into develop ... # Conflicts: # packages/client/src/pages/PortalSettings/categories/payments/PriceCalculation.js # packages/common/components/Article/sub-components/article-payment-alert.js # packages/components/scrollbar/custom-scrollbars-virtual-list.js # products/ASC.Files/Core/Core/CountRoomFeature.cs # products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs # products/ASC.Files/Core/Helpers/Global.cs		2023-04-10 17:24:09 +03:00
..
ASC.Files	Merge branch 'release/v1.0.0' into develop	2023-04-10 17:24:09 +03:00
ASC.People/Server	SignupAccountRequestDto: EmplType -> EmployeeType	2023-04-09 21:20:57 +03:00