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
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