Skip to content
GitLab
Commit 59d3f686 authored by Julien Gilli's avatar Julien Gilli
Browse files

Merge branch 'v0.12.1-release' into v0.12 

Conflicts:
	ChangeLog
parents 7e9d2f8d 0034086b
Expand all 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