Skip to content
GitLab
Commit 42a3ae6e authored by Kenneth Hoste's avatar Kenneth Hoste
Browse files

Merge branch 'v1.2.0.x' into develop 

Conflicts:
	setup.py
parents 04704ce1 c0e559a1
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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