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
..
browserslist-config-asc
client	Merge branch 'develop' into fix-conflicts-merge	2023-07-21 16:51:49 +03:00
common	Web:Common:PrivateRoute: fix	2023-07-19 15:32:27 +03:00
components	Web:Components:Slider: fix props	2023-07-19 18:38:23 +03:00
editor	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
login	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
auto-changelog-2.3.1.tgz