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

Merge branch 'master' into 'scan-actually-this-time' 

# Conflicts:
#   loopy/version.py
parents feeed159 06e5163e
Pipeline #6839 failed with stage
in 13 minutes and 30 seconds