Skip to content
Commit 7f8f0709 authored by 3dsman's avatar 3dsman
Browse files

Merge branch 'python' of git@moncloud.nohost.me:openEmbroider into selection 

Conflicts:
	include/OE_controller.h
	src/OE_controller.cpp
parents 5b24abcb 6d5b719d
Expand all 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