Merge branch 'stable'

This commit is contained in:
Georg Brandl
2016-01-14 22:54:08 +01:00
207 changed files with 283 additions and 257 deletions
+1 -1
View File
@@ -6,7 +6,7 @@
Tests for :mod:`sphinx.ext.napoleon.docstring` module.
:copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
:copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""