Merge branch 'master' into no-intersphinx-on-win
No related branches found
No related tags found
Showing
- .gitignore 2 additions, 2 deletions.gitignore
- ci/conda-recipe/meta.yaml 0 additions, 3 deletionsci/conda-recipe/meta.yaml
- docs/conf.py 11 additions, 7 deletionsdocs/conf.py
- psyplot_gui/help_explorer.py 2 additions, 2 deletionspsyplot_gui/help_explorer.py
- psyplot_gui/main.py 3 additions, 1 deletionpsyplot_gui/main.py
- psyplot_gui/sphinx_supp/conf.py 8 additions, 6 deletionspsyplot_gui/sphinx_supp/conf.py
- setup.py 1 addition, 1 deletionsetup.py
- tests/test_console.py 1 addition, 1 deletiontests/test_console.py
- tests/test_dataframeeditor.py 1 addition, 1 deletiontests/test_dataframeeditor.py
- tests/test_plot_creator.py 20 additions, 6 deletionstests/test_plot_creator.py
Loading
Please register or sign in to comment