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

Merge branch 'master' into 'scalars-with-base_storgae' 

# Conflicts:
#   test/test_loopy.py
parents 9f98e8d2 343ceb0e
Pipeline #3142 passed with stage
in 12 minutes and 27 seconds