Skip to content
Snippets Groups Projects
Commit 646631e7 authored by Thomas Kluyver's avatar Thomas Kluyver
Browse files

Merge branch 'master' into 'pre-commit-pass'

# Conflicts:
#   tests/test_cal_tools.py
parents d83d1cbe 776ec254
No related branches found
No related tags found
1 merge request!508Try to make pre-commit pass
Showing
with 795 additions and 235 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment