Commit 308d8c36 authored by con's avatar con

Merge remote branch 'origin/2.0'

Conflicts:
	doc/qt-html-templates.qdocconf
parents 30fae3ea 9250d000
Markdown is supported
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