Merge branch '2.0' into feature/autosummary_imported_members

Browse Source

# Conflicts:
#	doc/usage/extensions/autosummary.rst
#	tests/test_ext_autosummary.py

...

This commit is contained in:

tsanikgr committed 2019-04-03 17:34:18 +01:00

2 parents eb03b1406f c1c7cf8c8c

commit 8e2368926e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available