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

Merge branch 'v1.15.x' into develop 

Conflicts:
	setup.py
parents 6d9a5692 74624277
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