diff options
| author | Josh Triplett <josh@freedesktop.org> | 2008-02-09 23:02:52 -0800 |
|---|---|---|
| committer | Josh Triplett <josh@freedesktop.org> | 2008-02-09 23:02:52 -0800 |
| commit | 122f6df3259e8ca1dd96554d08cebce4b5c55acc (patch) | |
| tree | 2e1d6f54e62936792176caba483af8cc0907c755 /doc/users | |
| parent | fb82474be06f1be2c96bdfc231c3768cabe0d4eb (diff) | |
| parent | 8b577726ab3768d50ca7d3fdef240e37fe046fc2 (diff) | |
Merge branch 'master' into prefix-directives
Conflicts:
debian/changelog
templates/change.tmpl
Diffstat (limited to 'doc/users')
| -rw-r--r-- | doc/users/Edward_Betts.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/users/Edward_Betts.mdwn b/doc/users/Edward_Betts.mdwn index 8653c33c2..9b5435628 100644 --- a/doc/users/Edward_Betts.mdwn +++ b/doc/users/Edward_Betts.mdwn @@ -1,4 +1,4 @@ My watchlist: -[[inline pages="todo/allow_wiki_syntax_in_commit_messages" archive="yes" sort="mtime" atom="yes"]] +[[inline pages="todo/allow_wiki_syntax_in_commit_messages todo/shortcut_with_different_link_text" archive="yes" sort="mtime" atom="yes"]] |