pavelbannov
2c1d473314
# Conflicts: # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Server/Controllers/FilesController.cs |
||
---|---|---|
.. | ||
AuthenticationController.cs | ||
LdapController.cs | ||
ModulesController.cs | ||
PortalController.cs | ||
SettingsController.cs | ||
SmtpSettingsController.cs | ||
SsoSettingsV2Controller.cs |