IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
ae507d2ff8
DocSpace-client/common/services
History
pavelbannov 545bacfaf0 Merge branch 'develop' into fix-conflicts-merge 
# Conflicts:
#	packages/client/src/pages/VersionHistory/Section/Body/index.js
#	products/ASC.Files/Core/Configuration/FilesSettings.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Core/Security/FileShareOptions.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
2023-07-21 16:51:49 +03:00
..
ASC.ApiCache Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
ASC.ApiSystem Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
ASC.AuditTrail Merge branch 'develop' into fix-conflicts-merge 2023-07-21 16:51:49 +03:00
ASC.ClearEvents Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
ASC.Data.Backup Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
ASC.Data.Backup.BackgroundTasks Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
ASC.Data.Storage.Encryption add CustomSynchronizationContext 2023-03-27 15:04:50 +03:00
ASC.ElasticSearch fixed migrations 2023-07-19 18:29:17 +03:00
ASC.Feed.Aggregator Merge branch 'develop' into feature/delete-portal 2023-06-08 15:53:31 +03:00
ASC.Notify Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
ASC.Studio.Notify Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
ASC.TelegramService Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00