8000 Merge remote-tracking branch 'matplotlib/v2.2.x' · matplotlib/matplotlib@6632940 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6632940

Browse files
tacaswelltacaswell
committed
Merge remote-tracking branch 'matplotlib/v2.2.x'
Conflicts: .travis.yml - kept master version doc/devel/testing.rst - kept master version lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.svg - kept master version src/file_compat.h - kept master version
2 parents 6c020e8 + 2ae3b7a commit 6632940

File tree

1 file changed

+67
-1835
lines changed

1 file changed

+67
-1835
lines changed

0 commit comments

Comments
 (0)
0