Skip to content
Snippets Groups Projects
Commit 0e87a60a authored by Christoph Schmidt's avatar Christoph Schmidt
Browse files

Merge branch 'develop' 

# Conflicts:
#	src/CaptDeviceControl/__init__.py
parents 4d83d45c 9928183d
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/CaptDeviceControl/__init__.py
+ 1
− 1
View file @ 0e87a60a
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment