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

Merge branch 'master' into develop 

Conflicts:
	setup.py
parents 431691ed 8b1f6c40
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