Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-31

2bc88073 · GitLab Bot · cb906987 · 76099e7a · 2bc88073
Commit 2bc88073 authored May 31, 2018 by GitLab Bot
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

doc/user/project/index.md doc/user/project/index.md +2 -0

No files found.
--- a/doc/user/project/index.md
+++ b/doc/user/project/index.md
@@ -79,6 +79,8 @@ website with GitLab Pages

 **Other features:**

+- [Wiki](wiki/index.md): Document your GitLab project in an integrated Wiki
+- [Snippets](../snippets.md): Store, share and collaborate on code snippets
 - [Cycle Analytics](cycle_analytics.md): Review your development lifecycle
 - [Syntax highlighting](highlighting.md): An alternative to customize
 your code blocks, overriding GitLab's default choice of language