Merge "Use oslosphinx theme" into feature/zuulv3
diff --git a/doc/source/conf.py b/doc/source/conf.py
index f8ae368..71c7697 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -28,7 +28,8 @@
extensions = [
'sphinx.ext.autodoc',
'sphinxcontrib.blockdiag',
- 'sphinxcontrib.programoutput'
+ 'sphinxcontrib.programoutput',
+ 'oslosphinx'
]
#extensions = ['sphinx.ext.intersphinx']
#intersphinx_mapping = {'python': ('http://docs.python.org/2.7', None)}
diff --git a/test-requirements.txt b/test-requirements.txt
index baf6cad..eea1d69 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,5 +11,6 @@
testrepository>=0.0.17
testtools>=0.9.32
sphinxcontrib-programoutput
+oslosphinx
mock
PyMySQL