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
..
Cleanup	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
Core	removed .result	2023-05-31 10:42:09 +03:00
Expired	Merge branch 'develop' into feature/optimization-ef	2023-04-06 17:24:05 +03:00
Extensions	Merge branch 'develop' into feature/doc-space-info-panel	2022-09-16 18:26:36 +03:00
Log	convert ooxml(pr 1304)	2023-03-21 13:42:19 +03:00
Properties	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
Thumbnail	fix query	2023-06-28 13:27:32 +03:00
appsettings.json	Files: service replaced	2020-04-27 20:02:15 +03:00
ASC.Files.Service.csproj	migrate from .net6 to .net7	2022-11-10 13:10:18 +03:00
feed.json	Files.Service: added users module for feed aggregator	2023-01-18 18:36:06 +03:00
FileConverterService.cs	Merge branch 'develop' into feature/public-room-backend	2023-06-02 16:42:16 +03:00
GlobalUsings.cs	Merge branch 'release/v1.0.0' into develop	2023-04-13 13:27:58 +04:00
Program.cs	fix ide001	2022-11-07 12:49:29 +03:00
search.json	fix	2020-07-16 16:02:21 +03:00
Startup.cs	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00