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
..
ASC.Api.Core	Merge branch 'master' into feature/Wizard	2020-07-21 13:13:47 +03:00
ASC.Common	Added sendjoininvite, sendadmmail	2020-07-24 17:01:20 +03:00
ASC.Core.Common	Merge branch 'master' into feature/Wizard	2020-07-31 16:49:54 +03:00
ASC.Data.Reassigns	DI: refactoring	2020-07-17 13:52:28 +03:00
ASC.Data.Storage	DI: refactoring	2020-07-17 13:52:28 +03:00
ASC.FederatedLogin	Settings: added authproviders and login.ashx	2020-07-28 11:13:49 +03:00
ASC.Feed	Fix License	2020-07-08 18:30:23 +03:00
ASC.IPSecurity	DI: refactoring	2020-07-17 13:52:28 +03:00
ASC.MessagingSystem	DI: refactoring	2020-07-17 13:52:28 +03:00
ASC.Notify.Textile	DI: refactoring	2020-07-17 13:52:28 +03:00
ASC.Resource.Manager	Merge branch 'master' into feature/Wizard	2020-07-21 13:13:47 +03:00
ASC.Textile	TreatWarningsAsErrors=false	2020-02-03 14:27:41 +03:00
ASC.Thumbnails	Thumb: fix	2020-06-17 14:36:09 +03:00
ASC.UrlShortener	Added url shortener service	2020-03-05 14:45:34 +03:00
ASC.VoipService	References updated	2020-06-28 16:55:21 +03:00
services	Files: core. replace	2020-07-28 15:45:14 +03:00