8000 Merge remote-tracking branch 'origin/v3.0.x' into v3.1.x · matplotlib/matplotlib@11c24f3 · GitHub
[go: up one dir, main page]
Skip to content

Commit 11c24f3

Browse files
tacaswelltacaswell
committed
Merge remote-tracking branch 'origin/v3.0.x' into v3.1.x
Resolved all conflicts in favor of 3.1.x branch. This brings in changes that were put directly on the 3.0.x branch: - citing change - 3.0.2 gh stats - a bug-fix for xkcd mode - bug-fix for gh-stats tool
2 parents 13f8d86 + fc177a9 commit 11c24f3

File tree

4 files changed

+476
-2
lines changed

4 files changed

+476
-2
lines changed

‎doc/citing.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,16 @@ pp. 90-95, 2007 <https://doi.org/10.1109/MCSE.2007.55>`_.
2727
2828
DOIs
2929
----
30+
31+
v3.0.3
32+
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.2577644.svg
33+
:target: https://doi.org/10.5281/zenodo.2577644
34+
v3.0.2
35+
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1482099.svg
36+
:target: https://doi.org/10.5281/zenodo.1482099
37+
v3.0.1
38+
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1482098.svg
39+
:target: https://doi.org/10.5281/zenodo.1482098
3040
v3.0.0
3141
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1420605.svg
3242
:target: https://doi.org/10.5281/zenodo.1420605

0 commit comments

Comments
 (0)
0