diff options
| author | Sergey Linnik <sergey.linnik@onlyoffice.com> | 2022-06-09 16:40:11 +0300 |
|---|---|---|
| committer | Sergey Linnik <sergey.linnik@onlyoffice.com> | 2022-06-09 16:40:11 +0300 |
| commit | 8dc56d3a7f6c93762de39379bf745264997c61d6 (patch) | |
| tree | 77b398bc4ce2500232a567e686991ed44cd9b243 /appinfo | |
| parent | fecf53fdda42e655d740f4214e79b38d956433bd (diff) | |
| parent | 5c82247fc67e2956df2b7eeae40cbe5457c428b0 (diff) | |
Merge remote-tracking branch 'remotes/origin/feature/nc-23' into feature/extra-permissions_
# Conflicts:
# l10n/ru.js
# l10n/ru.json
Diffstat (limited to 'appinfo')
| -rw-r--r-- | appinfo/routes.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/appinfo/routes.php b/appinfo/routes.php index 7d1bc51..e2ab78e 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -38,7 +38,7 @@ return [ ["name" => "editor#restore", "url" => "/ajax/restore", "verb" => "PUT"], ["name" => "settings#save_address", "url" => "/ajax/settings/address", "verb" => "PUT"], ["name" => "settings#save_common", "url" => "/ajax/settings/common", "verb" => "PUT"], - ["name" => "settings#save_watermark", "url" => "/ajax/settings/watermark", "verb" => "PUT"], + ["name" => "settings#save_security", "url" => "/ajax/settings/security", "verb" => "PUT"], ["name" => "settings#get_settings", "url" => "/ajax/settings", "verb" => "GET"], ["name" => "settings#clear_history", "url" => "/ajax/settings/history", "verb" => "DELETE"], ["name" => "template#add_template", "url" => "/ajax/template", "verb" => "POST"], |