pavelbannov f00a964c32 Merge branch 'master' into feature/private ... # Conflicts: # common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs # web/ASC.Web.Api/Controllers/SettingsController.cs		2020-08-14 17:19:36 +03:00
..
DbAzService.cs	fixed removing from group	2020-02-03 14:27:13 +03:00
DbQuotaService.cs	private: firtst version	2020-08-12 12:58:08 +03:00
DbSettingsManager.cs	private: firtst version	2020-08-12 12:58:08 +03:00
DbSubscriptionService.cs	Added sendjoininvite, sendadmmail	2020-07-24 17:01:20 +03:00
DbTenantService.cs	Merge branch 'master' into feature/private	2020-08-14 17:19:36 +03:00
DbUserService.cs	private: firtst version	2020-08-12 12:58:08 +03:00