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
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment