Skip to content
GitLab
Commit 8d75235f authored by Petri Lehtinen's avatar Petri Lehtinen
Browse files

Merge branch '1.2' 

Conflicts:
	LICENSE
parents 79e9dae9 08dc8d9b
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