diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2018-08-10 12:13:45 +0000 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2018-08-10 12:13:45 +0000 |
commit | 63cf88810d35cccd66d27c6eb5e1a5c6157e53d3 (patch) | |
tree | ac8a4bd194bcdd0fb62570634a132a47c645e844 /doc/user/markdown.md | |
parent | f8f699ab976801af80221994fbfe148f39070d8a (diff) | |
parent | 52646106754a4eae02c6ae0c988508981c4f8e39 (diff) | |
download | gitlab-ce-63cf88810d35cccd66d27c6eb5e1a5c6157e53d3.tar.gz |
Merge branch 'master' into 'port-i18n-for-mirrors-instructions'
# Conflicts:
# app/views/projects/mirrors/_instructions.html.haml
Diffstat (limited to 'doc/user/markdown.md')
-rw-r--r-- | doc/user/markdown.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/user/markdown.md b/doc/user/markdown.md index bd199b55a61..d7bf6838fb3 100644 --- a/doc/user/markdown.md +++ b/doc/user/markdown.md @@ -259,6 +259,7 @@ GFM will recognize the following: | `@user_name` | specific user | | `@group_name` | specific group | | `@all` | entire team | +| `namespace/project>` | project | | `#12345` | issue | | `!123` | merge request | | `$123` | snippet | |