Artem Tarasov 1a8aacebdc Merge branch 'master' into feature/Wizard ... # Conflicts: # common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs # common/ASC.Resource.Manager/Startup.cs # web/ASC.Web.Components/src/components/password-input/index.js		2020-07-21 13:13:47 +03:00
..
Controllers	Merge branch 'master' into feature/Wizard	2020-07-15 15:23:28 +03:00
Core	Wizard: api	2020-07-02 17:11:59 +03:00
Models	Merge branch 'master' into feature/Wizard	2020-07-15 15:23:28 +03:00
Properties	Common nlog config	2019-11-15 11:47:56 +03:00
appsettings.json	External config	2019-06-21 11:03:42 +03:00
ASC.Web.Api.csproj	Merge branch 'master' into feature/Wizard	2020-07-15 15:23:28 +03:00
ASC.Web.Api.sln	init commit	2019-05-15 17:56:09 +03:00
Program.cs	general-startup: fix	2020-07-03 18:57:59 +03:00
Startup.cs	BaseStartup: refactoring	2020-07-15 15:33:44 +03:00