diff options
| author | Johann Pardanaud <pardanaud.j@gmail.com> | 2016-02-16 19:53:51 +0100 |
|---|---|---|
| committer | Johann Pardanaud <pardanaud.j@gmail.com> | 2016-02-16 19:53:51 +0100 |
| commit | fb6d7df347016726d84155d18b6d6f406d0121e9 (patch) | |
| tree | 9529bd4b546feeff391ca5a9db0a445f76a9521b /doc/markdown | |
| parent | 78588cfca15348ba062d33061c79df3cfa6b9883 (diff) | |
| parent | 7cc4b73942a0620678cd7e058d6dcde0ae71f4e6 (diff) | |
| download | gitlab-ce-fb6d7df347016726d84155d18b6d6f406d0121e9.tar.gz | |
Merge branch 'master' into avatar-cropping
Conflicts:
app/models/user.rb
Diffstat (limited to 'doc/markdown')
| -rw-r--r-- | doc/markdown/img/logo.png | bin | 0 -> 11097 bytes | |||
| -rw-r--r-- | doc/markdown/markdown.md | 8 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/markdown/img/logo.png b/doc/markdown/img/logo.png Binary files differnew file mode 100644 index 00000000000..7da5f23ed9b --- /dev/null +++ b/doc/markdown/img/logo.png diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md index f6bffba9fdb..c400cdac64d 100644 --- a/doc/markdown/markdown.md +++ b/doc/markdown/markdown.md @@ -424,24 +424,24 @@ will point the link to `wikis/style` when the link is inside of a wiki markdown Here's our logo (hover to see the title text): Inline-style: -  +  Reference-style: ![alt text1][logo] - [logo]: assets/logo.svg + [logo]: img/logo.png Here's our logo: Inline-style: - + Reference-style: ![alt text][logo] -[logo]: /assets/logo.svg +[logo]: img/logo.png ## Blockquotes |
