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
..
ApiControllerBase.cs	added new license headers	2022-03-15 21:00:53 +03:00
ContactsController.cs	moved from ddf515b8	2022-06-07 21:00:08 +03:00
GroupController.cs	moved from ddf515b8	2022-06-07 21:00:08 +03:00
NotificationController.cs	Api: removed CustomHttpMethodAttribute	2022-05-23 18:48:23 +03:00
PeopleControllerBase.cs	Merge branch 'develop' into feature/backend-refactor	2022-04-21 22:36:29 +03:00
PhotoController.cs	moved from ddf515b8	2022-06-07 21:00:08 +03:00
ReassignController.cs	Api: removed CustomHttpMethodAttribute	2022-05-23 18:48:23 +03:00
RemoveUserDataController.cs	Api: removed CustomHttpMethodAttribute	2022-05-23 18:48:23 +03:00
ThirdpartyController.cs	moved from ddf515b8	2022-06-15 12:46:21 +03:00
UserController.cs	Merge branch 'release/v1.2' into develop	2022-07-07 17:41:41 +03:00