aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Diener <[email protected]>2017-09-08 15:02:58 +0200
committerGitHub <[email protected]>2017-09-08 15:02:58 +0200
commit7de02fe5b8da76fc3d8f6aa063996433119a2214 (patch)
tree4d93477df1050df501196a217ba0ac7f84e3f506 /docs/conf.py
parent4a5302e03a3ecde244153cde2f79d2ae5a31ff94 (diff)
parent0edc424b11a14ce2908ac16739b910febdd1e140 (diff)
downloadmastodon.py-7de02fe5b8da76fc3d8f6aa063996433119a2214.tar.gz
Merge branch 'master' into async_streaming
Diffstat (limited to 'docs/conf.py')
-rw-r--r--docs/conf.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 9c4a292..4c5352a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -30,7 +30,7 @@ import os
30import sys 30import sys
31sys.path.insert(0, os.path.abspath('../')) 31sys.path.insert(0, os.path.abspath('../'))
32autodoc_member_order = 'by_source' 32autodoc_member_order = 'by_source'
33#print(sys.path) 33# print(sys.path)
34 34
35# Add any Sphinx extension module names here, as strings. They can be 35# Add any Sphinx extension module names here, as strings. They can be
36# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom 36# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
@@ -154,7 +154,7 @@ todo_include_todos = False
154# html_logo = None 154# html_logo = None
155 155
156# The name of an image file (relative to this directory) to use as a favicon of 156# The name of an image file (relative to this directory) to use as a favicon of
157# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 157# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
158# pixels large. 158# pixels large.
159# 159#
160# html_favicon = None 160# html_favicon = None
Powered by cgit v1.2.3 (git 2.41.0)