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
..
License.cs	Fix parse license	2020-08-04 17:29:43 +03:00
LicenseException.cs	init commit	2019-05-15 17:56:09 +03:00
LicenseReader.cs	Merge branch 'master' into feature/private	2020-08-14 17:19:36 +03:00