pavelbannov 1675896294 Merge branch 'develop' into feature/dotnet5 ... # Conflicts: # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs # products/ASC.Files/Core/Services/WCFService/IFileStorageService.cs		2020-12-04 11:59:10 +03:00
..
GroupController.cs	People: filter groups	2020-11-24 16:13:49 +03:00
PeopleController.cs	Merge branch 'develop' into feature/dotnet5	2020-12-04 11:59:10 +03:00