pavelbannov
f8be896241
# 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 |
||
---|---|---|
.. | ||
Properties | ||
Resources | ||
ASC.Notify.Textile.csproj | ||
JabberStyler.cs | ||
PushStyler.cs | ||
StylerTests.cs | ||
TextileStyler.cs |