Viewing all changes in revision 536.

Committer: GitHub
Author(s): Thomas Kluyver
Date: 2016-12-20 12:01:21 UTC
mfrom: <a title="Merged From 533.2.3" href="/~pythonxy/pythonxy-upstream/nbconvert/revision/533.2.3">(533.2.3)
Revision ID: git-v1:95080274557a64ed8978911edab15a9462aaa73f

Merge pull request #493 from michaelpacer/5.x

bring up to date with nbsphinx's compatibility with sphinx 1.5.1

added added

removed removed

~pythonxy/pythonxy-upstream/nbconvert