Vashchuk Nikita 6507c4b999 Merge branch 'develop' into feature/migrations-fix ... # Conflicts: # products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs # web/ASC.Web.Core/GlobalUsings.cs		2022-07-14 11:56:07 +03:00
..
Auth	Api: remove service locator	2022-03-22 18:44:10 +03:00
Convention	added new license headers	2022-03-15 21:00:53 +03:00
Core	Merge branch 'release/v1.2' into develop	2022-06-30 16:13:31 +03:00
Extensions	Merge branch 'develop' into feature/logger-refactoring	2022-05-20 17:01:51 +03:00
Log	Log: refactoring	2022-05-26 12:01:54 +03:00
Middleware	fix payment	2022-07-04 14:54:24 +03:00
Model	EmployeeDtoHelper: user cache	2022-07-05 12:55:19 +03:00
Routing	Api: removed CustomHttpMethodAttribute	2022-05-23 18:48:23 +03:00
Security	fix	2022-07-13 18:15:29 +03:00
ASC.Api.Core.csproj	Merge branch 'develop' into feature/logger-refactoring	2022-05-24 23:13:57 +03:00
GlobalUsings.cs	Merge branch 'develop' into feature/migrations-fix	2022-07-11 13:28:49 +03:00