pavelbannov 1490332568 Merge branch 'develop' into refactoring/scope ... # Conflicts: # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs # products/ASC.Files/Core/Helpers/WordpressHelper.cs # products/ASC.Files/Server/Controllers/PrivacyRoomController.cs # products/ASC.Files/Server/Startup.cs		2020-11-10 11:42:50 +03:00
..
ASC.Api.Core	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
ASC.Common	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
ASC.Core.Common	Merge branch 'develop' into refactoring/scope	2020-11-10 11:42:50 +03:00
ASC.Data.Reassigns	Scope: refactoring. Notify, People	2020-10-27 18:34:22 +03:00
ASC.Data.Storage	Refactoring: scope.	2020-10-29 11:13:51 +03:00
ASC.FederatedLogin	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
ASC.Feed	Scope: refactoring	2020-10-19 18:53:15 +03:00
ASC.IPSecurity	Scope: refactoring	2020-10-19 18:53:15 +03:00
ASC.MessagingSystem	Refacoring: scope	2020-10-21 14:12:08 +03:00
ASC.Notify.Textile	Scope: refactoring	2020-10-19 18:53:15 +03:00
ASC.Resource.Manager	ResManager: fix	2020-10-29 22:15:14 +03:00
ASC.Socket.IO	socket.io: first version	2020-08-02 23:12:45 +03:00
ASC.Textile	revert discard	2020-10-12 22:39:23 +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	Refactoring: scope	2020-10-29 17:30:08 +03:00
services	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00