Skip to content
Snippets Groups Projects
Commit d60195df authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.1'

Conflicts:
	.travis.yml
parents 9c308b55 18ebb807
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment