pavelbannov 7af929fee8 Merge branch 'release/v1.2' into develop ... # Conflicts: # common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs # common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs # products/ASC.People/Server/Controllers/PeopleController.cs # products/ASC.People/Server/Models/MemberModel.cs # web/ASC.Web.Api/Controllers/SettingsController.cs		2022-07-07 17:41:41 +03:00
..
minify-common-locales.js	Web: Translations: Added minimization for 'public/locales' directory	2022-07-03 15:55:53 +03:00
socketio.bat	added socketio	2022-02-24 13:47:18 +03:00
ssoauth.bat	add ssoAuth.bat with yarn install	2022-03-04 16:50:12 +03:00
urlshortener.bat	refactoring build scripts	2021-12-24 16:47:37 +03:00
webdav.bat	moved from ddf515b8	2022-06-16 17:16:46 +03:00