Skip to content
Commit 6bad1def authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Merge branch 'master' into 'use-git-rev-as-cache-key' 

# Conflicts:
#   pytential/version.py
parents 405c4e77 73c03db3
Pipeline #10826 failed with stage
in 24 minutes and 25 seconds