pavelbannov f8be896241 Merge branch 'develop' into feature/dotnet5 ... # Conflicts: # common/ASC.Common/ASC.Common.csproj # common/ASC.Core.Common/ASC.Core.Common.csproj # common/ASC.Core.Common/EF/Context/BaseDbContext.cs # common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs		2021-01-22 16:34:40 +03:00
..
Properties	Added Textile launcher	2019-08-23 15:50:08 +03:00
Resources	moved from hotfix/10.5.2	2020-01-21 18:28:34 +03:00
ASC.Notify.Textile.csproj	net5.0	2020-11-15 18:55:57 +03:00
JabberStyler.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
PushStyler.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
StylerTests.cs	fix-messages: IDE0051 and IDE0052	2020-09-29 11:57:37 +03:00
TextileStyler.cs	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00