merge with 3.4

This commit is contained in:
Georg Brandl 2014-09-30 22:17:48 +02:00
commit 7552eb89b9
2 changed files with 3 additions and 1 deletions

View file

@ -345,3 +345,4 @@ def setup(app):
app.add_directive_to_domain('py', 'decorator', PyDecoratorFunction)
app.add_directive_to_domain('py', 'decoratormethod', PyDecoratorMethod)
app.add_directive('miscnews', MiscNews)
return {'version': '1.0', 'parallel_read_safe': True}