Merge branch 'master' into devel

This commit is contained in:
Gina Häußge 2014-08-31 21:41:54 +02:00
commit 02c8a1703a

2
docs/requirements.txt Normal file
View file

@ -0,0 +1,2 @@
sphinxcontrib-httpdomain
sphinx_rtd_theme