8000 Merge remote-tracking branch 'matplotlib/v2.x' · dashed/matplotlib@0805e16 · GitHub
[go: up one dir, main page]

Skip to content

Commit 0805e16

Browse files
committed
Merge remote-tracking branch 'matplotlib/v2.x'
Conflicts: lib/matplotlib/tests/test_image.py white-space, resolved in favor of master in both cases
2 parents fc031e4 + 9e0a46a commit 0805e16

File tree

6 files changed

+108
-108
lines changed

6 files changed

+108
-108
lines changed
Loading

0 commit comments

Comments
 (0)
0