Skip to content

Commit 6b1383a

Browse files
committed
Merge remote-tracking branch 'origin/v3.0.x'
Conflicts: doc/api/textpath_api.rst doc/devel/testing.rst lib/matplotlib/axes/_axes.py lib/matplotlib/axes/_base.py lib/matplotlib/tests/test_axes.py lib/matplotlib/tests/test_cbook.py lib/matplotlib/textpath.py lib/matplotlib/tight_layout.py lib/mpl_toolkits/axisartist/axis_artist.py tutorials/colors/colormap-manipulation.py In all cases of conflict kept master branch version
2 parents 2d2dab5 + 1468456 commit 6b1383a

File tree

2 files changed

+433
-811
lines changed

2 files changed

+433
-811
lines changed

0 commit comments

Comments
 (0)