Commit Graph

5 Commits

Author SHA1 Message Date
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
bb6f32e36a Api: fix 2020-05-18 15:08:03 +03:00
3a747ef8e4 Merge branch 'master' into feature/system-json
# Conflicts:
#	common/ASC.Api.Core/Core/ApiContext.cs
#	common/ASC.Api.Core/Core/ApiDateTime.cs
#	common/ASC.Api.Core/Model/EmployeeWraper.cs
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.People/Server/Models/GroupWrapperFull.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Models/BuildVersion.cs
2020-05-07 10:28:20 +03:00
35e2e20049 Files: added model 2020-02-25 15:21:48 +03:00