Skip to content
GitLab
Commit 888038e6 authored by Domingo Manubens-Gil's avatar Domingo Manubens-Gil
Browse files

Merge branch 'develop-3.0.0' into develop 

Conflicts:
	README
parents 3a86f969 896cf2ec
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