diff options
author | shimizukawa <shimizukawa@gmail.com> | 2015-03-17 18:26:27 +0900 |
---|---|---|
committer | shimizukawa <shimizukawa@gmail.com> | 2015-03-17 18:26:27 +0900 |
commit | e2da583be85a74f5ce25200836227aa5b8c85b67 (patch) | |
tree | 83cdbd1031dbe7dffe963cf87e148160ee3366ee /tests/path.py | |
parent | 64665f136b781426c526877283f30b690c1fa074 (diff) | |
parent | a4083dde29022eecf26281cf23f54ea586520ec9 (diff) | |
download | sphinx-git-e2da583be85a74f5ce25200836227aa5b8c85b67.tar.gz |
Merge branch 'stable'
Conflicts:
CHANGES
sphinx/__init__.py
Diffstat (limited to 'tests/path.py')
0 files changed, 0 insertions, 0 deletions