pavelbannov 29a0e752bb Merge branch 'master' into feature/backup ... # Conflicts: # ASC.Web.sln # web/ASC.Web.Api/Controllers/PortalController.cs		2020-06-25 19:21:42 +03:00
..
ASC.Api.Core	References updated	2020-06-25 14:38:34 +03:00
ASC.Common	Merge branch 'master' into feature/backup	2020-06-25 15:37:53 +03:00
ASC.Core.Common	Merge branch 'master' into feature/backup	2020-06-25 15:37:53 +03:00
ASC.Data.Reassigns	ProgressQueue: fix	2020-06-08 12:44:01 +03:00
ASC.Data.Storage	Merge branch 'master' into feature/backup	2020-06-25 15:37:53 +03:00
ASC.FederatedLogin	Files: updated JWT	2020-04-16 16:07:30 +03:00
ASC.Feed	Feed: FilesModule	2020-06-04 13:54:13 +03:00
ASC.IPSecurity	Merge branch 'master' into feature/elastic	2020-02-25 11:24:45 +03:00
ASC.MessagingSystem	Files: simplified getHeaders method	2020-06-01 15:16:24 +03:00
ASC.Notify.Textile	Added DIHelper	2020-02-17 11:58:14 +03:00
ASC.Resource.Manager	References updated	2020-06-25 14:38:34 +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	Added DI for Voip	2020-04-17 17:07:44 +03:00
services	Merge branch 'master' into feature/backup	2020-06-25 19:21:42 +03:00