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
..
ConfirmTypeEnum.cs	Merge branch 'master' into feature/Wizard	2020-07-15 15:23:28 +03:00
Constants.cs	private: firtst version	2020-08-12 12:58:08 +03:00
DisplayUserNameFormat.cs	init commit	2019-05-15 17:56:09 +03:00
DisplayUserSettings.cs	private: firtst version	2020-08-12 12:58:08 +03:00
PersonalQuotaSettings.cs	Fix License	2020-07-08 18:30:23 +03:00
UserExtensions.cs	EF: DbUserService	2019-11-25 12:49:12 +03:00
UserFormatter.cs	private: firtst version	2020-08-12 12:58:08 +03:00