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

Merge branch 'master' into 'quad-clean' 

# Conflicts:
#   grudge/discretization.py
parents c9008e9d 62cb59dc
Pipeline #9661 passed with stage
in 14 minutes and 34 seconds