Skip to content
Snippets Groups Projects
Commit 5f56a399 authored by moritz's avatar moritz
Browse files

Merge branch 'master' into detector_changes

# Conflicts:
#	peyote/detector.py
parents 7bd94752 e7423c96
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment