pavelbannov
f00a964c32
# Conflicts: # common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs # web/ASC.Web.Api/Controllers/SettingsController.cs |
||
---|---|---|
.. | ||
EncryptionController.cs | ||
FilesController.cs |
pavelbannov
f00a964c32
# Conflicts: # common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs # web/ASC.Web.Api/Controllers/SettingsController.cs |
||
---|---|---|
.. | ||
EncryptionController.cs | ||
FilesController.cs |