Skip to content
Snippets Groups Projects
Commit c2d3ecad authored by Nikita Popov's avatar Nikita Popov
Browse files

Merge branch '3.x'

Conflicts:
	CHANGELOG.md
parents 1cdb280a e57b3a09
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