TatianaLopaeva 3eeb24a5b5 Merge branch 'feature/files' into feature/payments-enterprise ... # Conflicts: # web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js # web/ASC.Web.Components/src/components/icons/svg/index.js		2020-09-15 17:52:45 +03:00
..
Controllers	Merge branch 'feature/files' into feature/payments-enterprise	2020-09-07 18:42:57 +03:00
Core	Moved from v10.5.2-saas	2020-09-11 17:12:35 +03:00
Models	AuthService: added description	2020-09-03 11:43:13 +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