pavelbannov 3ca0990715 Merge branch 'master' into feature/files ... # Conflicts: # common/ASC.Core.Common/EF/Model/FilesConverts.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs		2020-10-08 19:01:09 +03:00
..
ASC.Api.Core	Fix confirm	2020-10-07 13:45:53 +03:00
ASC.Common	Merge branch 'master' into feature/schema	2020-10-08 11:42:57 +03:00
ASC.Core.Common	Merge branch 'master' into feature/files	2020-10-08 19:01:09 +03:00
ASC.Data.Reassigns	Reassign: fix scope	2020-10-07 11:23:43 +03:00
ASC.Data.Storage	Merge branch 'master' into feature/release-11.0.0	2020-09-23 14:00:24 +03:00
ASC.FederatedLogin	Merge branch 'master' into feature/schema	2020-10-01 12:25:07 +03:00
ASC.Feed	fix	2020-08-27 17:01:37 +03:00
ASC.IPSecurity	private: firtst version	2020-08-12 12:58:08 +03:00
ASC.MessagingSystem	moved from release/11 4414f77b	2020-09-22 17:17:17 +03:00
ASC.Notify.Textile	Api: moved from release/11 4414f77b	2020-09-17 15:04:28 +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	fix	2020-08-27 17:01:37 +03:00
ASC.Thumbnails
ASC.UrlShortener
ASC.VoipService	DI: refactoring	2020-10-08 11:36:47 +03:00
services	Merge branch 'master' into feature/files	2020-09-28 12:29:33 +03:00