pavelbannov 72ae1f5e9b Merge branch 'master' into feature/Wizard ... # Conflicts: # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Api/Models/SettingsWrapper.cs # web/ASC.Web.Common/src/api/settings/index.js		2020-07-31 16:49:54 +03:00
..
Controllers	Merge branch 'master' into feature/Wizard	2020-07-31 16:49:54 +03:00
Core	Wizard: api	2020-07-02 17:11:59 +03:00
Models	Merge branch 'master' into feature/Wizard	2020-07-31 16:49:54 +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	Added sendjoininvite, sendadmmail	2020-07-24 17:01:20 +03:00