Commit 800eaf6c authored by Martin Bauer's avatar Martin Bauer
Browse files

Merge branch 'master' into 'ConditionalFieldAccess'

# Conflicts:
#   pystencils/data_types.py
parents 8dfe844c ae69d3d3
Pipeline #18637 passed with stage
in 2 minutes and 59 seconds