diff options
| author | Eli Zaretskii | 2013-04-14 20:27:45 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-04-14 20:27:45 +0300 |
| commit | eb7a410c147507ffdf0e84d163a014acb82b19a2 (patch) | |
| tree | 2274bf05e320123c234afbe38dc97932b943c0ea /admin/notes/bugtracker | |
| parent | 64544985029d58bada3486a3eba7f11ce690c526 (diff) | |
| parent | ddd6b68524ba1f957e2f8ddd76eb23e641429b58 (diff) | |
| download | emacs-eb7a410c147507ffdf0e84d163a014acb82b19a2.tar.gz emacs-eb7a410c147507ffdf0e84d163a014acb82b19a2.zip | |
Merge from trunk, resolve conflicts.
Diffstat (limited to 'admin/notes/bugtracker')
| -rw-r--r-- | admin/notes/bugtracker | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker index 61f8027e9a2..9957bc9b567 100644 --- a/admin/notes/bugtracker +++ b/admin/notes/bugtracker | |||
| @@ -103,7 +103,7 @@ This is annoying. | |||
| 103 | to hopefully stop this happening, but it is still better to use X-Debbugs-CC.) | 103 | to hopefully stop this happening, but it is still better to use X-Debbugs-CC.) |
| 104 | 104 | ||
| 105 | If a new report contains X-Debbugs-CC in the input, this is | 105 | If a new report contains X-Debbugs-CC in the input, this is |
| 106 | converted to a real Cc header in the output. (See Bug#1720). | 106 | converted to a real Cc header in the output. (See Bug#1780,5384) |
| 107 | It is also merged into the Resent-CC header (see below). | 107 | It is also merged into the Resent-CC header (see below). |
| 108 | 108 | ||
| 109 | ** How does Debbugs send out mails? | 109 | ** How does Debbugs send out mails? |