about summary refs log tree commit diff
path: root/docs/README.md
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-03 01:07:53 +0200
committerGitHub <noreply@github.com>2017-04-03 01:07:53 +0200
commitd2358aefecb6858eab641752a3279cdaa824eaa3 (patch)
treec9393bbbe41a1c72bc2e40e924083c242f16588b /docs/README.md
parentc76d20c2a0572f1da7d2fafcd6c7a90aa6caf7f1 (diff)
parent30df1c8476739a7439762eb678962a5254918323 (diff)
Merge branch 'master' into master
Diffstat (limited to 'docs/README.md')
-rw-r--r--docs/README.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/README.md b/docs/README.md
index d35dece14..abf6fcc4b 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -7,6 +7,7 @@ Index
 - [Frequently Asked Questions](Using-Mastodon/FAQ.md)
 - [List of Mastodon instances](Using-Mastodon/List-of-Mastodon-instances.md)
 - [Apps](Using-Mastodon/Apps.md)
+- [User Guide](Using-Mastodon/User-guide.md)
 
 ### Using the API
 - [API documentation](Using-the-API/API.md)