Merge remote-tracking branch 'matplotlib/v2.2.x' · godsic/matplotlib@6632940 · GitHub

Commit

Merge remote-tracking branch 'matplotlib/v2.2.x'

Browse files

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

Loading branch information

tacaswell committed Aug 11, 2018

2 parents 6c020e8 + 2ae3b7a commit 6632940