Skip to content
GitLab
Commit 4e63fcd5 authored by Petri Lehtinen's avatar Petri Lehtinen
Browse files

Merge branch '1.2' 

Conflicts:
	configure.ac
parents 49880cba 024106bb
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