diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2013-10-25 16:50:25 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2013-10-25 16:50:25 +0200 |
| commit | 98b7b548a229600f7653cd67d9aae43675938143 (patch) | |
| tree | 15c141db332b9ae87ef3fbf573ea32d30dc1ea76 /program/steps/settings/func.inc | |
| parent | 4e4c2511bc00cfc0214acab63b097efe142187a7 (diff) | |
| parent | 9c41ba3c9ebbb14d01abe961c420f71f9463e61a (diff) | |
Merge branch 'dev-canned-responses'
Conflicts (resolved):
skins/classic/includes/settingstabs.html
skins/larry/includes/settingstabs.html
Diffstat (limited to 'program/steps/settings/func.inc')
| -rw-r--r-- | program/steps/settings/func.inc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index af278e5fa..3b599c0e5 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -1321,4 +1321,7 @@ $RCMAIL->register_action_map(array( 'purge' => 'folders.inc', 'folder-size' => 'folders.inc', 'add-identity' => 'edit_identity.inc', + 'add-response' => 'edit_response.inc', + 'save-response' => 'edit_response.inc', + 'delete-response' => 'responses.inc', )); |