Tatiana Lopaeva 8ba2f0c694 Merge branch 'develop' into feature/backup ... # Conflicts: # packages/asc-web-common/api/settings/index.js # web/ASC.Web.Api/Models/SettingsWrapper.cs		2021-10-25 11:02:42 +03:00
..
Auth	fixed bearer	2021-09-24 12:08:10 +03:00
Convention	added ControllerNameAttributeConvention	2021-04-02 18:46:00 +03:00
Core	Files: fix rename folders. fix favorites	2021-09-30 21:26:01 +03:00
Middleware	add Tenant status in settings and refactoring tenantStatusFilter	2021-06-30 17:26:46 +03:00
Model	Scope: refactoring	2020-10-19 18:53:15 +03:00
Routing	Files: thirdparty fix	2020-03-16 11:25:39 +03:00
ASC.Api.Core.csproj	fixed run via vs	2021-08-23 15:55:19 +03:00