diff options
| author | Adam Turner <9087854+aa-turner@users.noreply.github.com> | 2022-09-30 16:13:11 +0100 |
|---|---|---|
| committer | Adam Turner <9087854+aa-turner@users.noreply.github.com> | 2022-09-30 16:13:11 +0100 |
| commit | 29060711984f9ad6be210d9a237a5f5cd5bce5c9 (patch) | |
| tree | fe2e8b0ac1ce5cc0b160ed5a3a6ec395e7e75d32 /sphinx/pycode/parser.py | |
| parent | 7514e5c6d49c47aa76b714ea42edf35e52a4b050 (diff) | |
| parent | cbb19d6947d7d2a3898e2e0ca2c173071bca647b (diff) | |
| download | sphinx-git-29060711984f9ad6be210d9a237a5f5cd5bce5c9.tar.gz | |
Merge branch '5.2.x' into 5.x
# Conflicts:
# CHANGES
# sphinx/__init__.py
Diffstat (limited to 'sphinx/pycode/parser.py')
0 files changed, 0 insertions, 0 deletions