pavelbannov 02f39a9c71 Merge branch 'master' into feature/files ... # Conflicts: # common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20201006101804_WebstudioDbContextMySql.cs # common/ASC.Core.Common/Migrations/Npgsql/WebstudioDbContextNpgsql/20200929102646_WebstudioDbContextNpgsql.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs # products/ASC.Files/Core/Core/FileStorageService.cs # web/ASC.Web.Core/Files/FileUtility.cs		2020-10-13 12:52:28 +03:00
..
ASC.Api.Core	revert discard	2020-10-12 22:39:23 +03:00
ASC.Common	revert discard	2020-10-12 22:39:23 +03:00
ASC.Core.Common	Merge branch 'master' into feature/files	2020-10-13 12:52:28 +03:00
ASC.Data.Reassigns	revert discard	2020-10-12 22:39:23 +03:00
ASC.Data.Storage	revert discard	2020-10-12 22:39:23 +03:00
ASC.FederatedLogin	revert discard	2020-10-12 22:39:23 +03:00
ASC.Feed	revert discard	2020-10-12 22:39:23 +03:00
ASC.IPSecurity	revert discard	2020-10-12 22:39:23 +03:00
ASC.MessagingSystem	revert discard	2020-10-12 22:39:23 +03:00
ASC.Notify.Textile	fix-messages: IDE0051 and IDE0052	2020-09-29 11:57:37 +03:00
ASC.Resource.Manager	moved from release/11 4414f77b	2020-09-22 17:17:17 +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	revert discard	2020-10-12 22:39:23 +03:00
services	Merge branch 'master' into feature/files	2020-10-13 12:52:28 +03:00